You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2007/10/02 23:21:05 UTC

svn commit: r581389 - /httpd/httpd/trunk/modules/http/http_core.c

Author: jim
Date: Tue Oct  2 14:21:04 2007
New Revision: 581389

URL: http://svn.apache.org/viewvc?rev=581389&view=rev
Log:

Ensure the URI is "*" and not something like "*foo"

Oh, last commit was supposed to say we need to return
DONE so we don't invoke any handlers.

Modified:
    httpd/httpd/trunk/modules/http/http_core.c

Modified: httpd/httpd/trunk/modules/http/http_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_core.c?rev=581389&r1=581388&r2=581389&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_core.c (original)
+++ httpd/httpd/trunk/modules/http/http_core.c Tue Oct  2 14:21:04 2007
@@ -236,7 +236,8 @@
 
 static int http_send_options(request_rec *r)
 {
-    if ((r->method_number == M_OPTIONS) && r->uri && (r->uri[0] == '*')) {
+    if ((r->method_number == M_OPTIONS) && r->uri && (r->uri[0] == '*') &&
+         (r->uri[1] == '\0')) {
         return DONE;           /* Send HTTP pong, without Allow header */
     }
     return DECLINED;



Re: svn commit: r581389 - /httpd/httpd/trunk/modules/http/http_core.c

Posted by "Roy T. Fielding" <fi...@gbiv.com>.
On Oct 2, 2007, at 2:21 PM, jim@apache.org wrote:

> Author: jim
> Date: Tue Oct  2 14:21:04 2007
> New Revision: 581389
>
> URL: http://svn.apache.org/viewvc?rev=581389&view=rev
> Log:
>
> Ensure the URI is "*" and not something like "*foo"

I did not want that case to pass through, on purpose.

....Roy


Re: svn commit: r581389 - /httpd/httpd/trunk/modules/http/http_core.c

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
jim@apache.org wrote:
> 
> Oh, last commit was supposed to say we need to return
> DONE so we don't invoke any handlers.

Just so everyone here knows;

svn propset --revprop -r581388 svn:log "Return DONE instead of OK to prevent any
further hooks from touching the non-URI OPTIONS * request"

and it appears we now get revprop commit messages!  Hooray :)

Re: svn commit: r581389 - /httpd/httpd/trunk/modules/http/http_core.c

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
jim@apache.org wrote:
> 
> Oh, last commit was supposed to say we need to return
> DONE so we don't invoke any handlers.

Just so everyone here knows;

svn propset --revprop -r581388 svn:log "Return DONE instead of OK to prevent any
further hooks from touching the non-URI OPTIONS * request"

and it appears we now get revprop commit messages!  Hooray :)

Re: svn commit: r581389 - /httpd/httpd/trunk/modules/http/http_core.c

Posted by Joe Schaefer <jo...@sunstarsys.com>.
"William A. Rowe, Jr." <wr...@rowe-clan.net> writes:

> Just so everyone here knows;
>
> svn propset --revprop -r581388 svn:log "Return DONE instead of OK to
> prevent any further hooks from touching the non-URI OPTIONS * request"
>
> and it appears we now get revprop commit messages!  Hooray :)

You're welcome.  Now if I could only get the svn devs
to include that patch (r23815) in their next release...

-- 
Joe Schaefer