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/09 15:16:50 UTC
svn commit: r583150 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/http/http_core.c
Author: jim
Date: Tue Oct 9 06:16:49 2007
New Revision: 583150
URL: http://svn.apache.org/viewvc?rev=583150&view=rev
Log:
Merge r582795 from trunk:
Note PR 43519 is closed...
Reviewed by: jim
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/http/http_core.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=583150&r1=583149&r2=583150&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Oct 9 06:16:49 2007
@@ -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]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=583150&r1=583149&r2=583150&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Oct 9 06:16:49 2007
@@ -79,12 +79,6 @@
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
Modified: httpd/httpd/branches/2.2.x/modules/http/http_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/http/http_core.c?rev=583150&r1=583149&r2=583150&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/http_core.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/http_core.c Tue Oct 9 06:16:49 2007
@@ -222,6 +222,15 @@
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 @@
}
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);