httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject svn commit: r581374 - /httpd/httpd/trunk/modules/http/http_core.c
Date Tue, 02 Oct 2007 20:36:47 GMT
Author: fielding
Date: Tue Oct  2 13:36:47 2007
New Revision: 581374

URL: http://svn.apache.org/viewvc?rev=581374&view=rev
Log:
Reduce the last change to a minimum, since OPTIONS * does not
include an Allow header field (* is not a resource).


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=581374&r1=581373&r2=581374&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_core.c (original)
+++ httpd/httpd/trunk/modules/http/http_core.c Tue Oct  2 13:36:47 2007
@@ -236,21 +236,11 @@
 
 static int http_send_options(request_rec *r)
 {
-    int rv;
-    if ((r->method_number != M_OPTIONS) || !r->uri || strcmp(r->uri, "*")) {
-        return DECLINED;
+    if ((r->method_number == M_OPTIONS) && r->uri && (r->uri[0]
== '*')) {
+        return OK;           /* Send HTTP pong, without Allow header */
     }
-
-    ap_allow_standard_methods(r, MERGE_ALLOW, M_GET, M_OPTIONS, M_POST, -1);
-    rv = ap_send_http_options(r);
-
-    if (rv == OK) {
-        rv = DONE;
-    }
-
-    return rv;
+    return DECLINED;
 }
-
 
 static void register_hooks(apr_pool_t *p)
 {



Mime
View raw message