Merge r582795 from trunk:

Note PR 43519 is closed...

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@583150 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index fb511761ce6fcb9abd9edf48e464d50d34e3a0b4..00e9cae588d4fea5d748c12af134dddfb4e9d4a1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.7
 
+  *) http_core: OPTIONS * no longer maps to local storage or URI
+     space. PR 43519 [Jim Jagielski]
+
   *) mod_proxy_http: strip hop-by-hop response headers
      PR 43455 [Nick Kew]
 

diff --git a/STATUS b/STATUS
index b983c5d6368ab80b4dbacd15ef5cf32c7401efde..9318ce0b0737d4e82a95fbb4bd66f4567d82ba23 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -79,12 +79,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * http_core: OPTIONS * no longer tries to map to local storage or
-     URI space. PR 43519.
-     http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_core.c?r1=581358&r2=581389
-     http://svn.apache.org/viewvc?view=rev&revision=582795
-     +1: jim, rpluem, niq
-
    * mpm_common: Use OPTIONS * instead of GET / for dummy_connection.
      Trunk version of patch:
         http://svn.apache.org/viewvc?view=rev&revision=517233

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index b52b547786d20de8ac63a8bd994e8b530c8ea7a6..1e4da5d10f9d47a2e1f814e91faced8aee974a0e 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -222,6 +222,15 @@ static int http_create_request(request_rec *r)
     return OK;
 }
 
+static int http_send_options(request_rec *r)
+{
+    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;
+}
+
 static void register_hooks(apr_pool_t *p)
 {
     /**
@@ -240,6 +249,7 @@ static void register_hooks(apr_pool_t *p)
     }
 
     ap_hook_map_to_storage(ap_send_http_trace,NULL,NULL,APR_HOOK_MIDDLE);
+    ap_hook_map_to_storage(http_send_options,NULL,NULL,APR_HOOK_MIDDLE);
     ap_hook_http_scheme(http_scheme,NULL,NULL,APR_HOOK_REALLY_LAST);
     ap_hook_default_port(http_port,NULL,NULL,APR_HOOK_REALLY_LAST);
     ap_hook_create_request(http_create_request, NULL, NULL, APR_HOOK_REALLY_LAST);