Remove CGI block on OPTIONS method so that scripts can

respond to OPTIONS directly rather than via server default.

PR: 15242
Reviewed-by: Paul Querna, Andre Malo, William A. Rowe, Jr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@326256 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index a7f4d278c35ec73a1a5e18d02279f3c5af5fd29f..c678203cef9f6e6be535f61c44625e0711f71090 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 1.3.35
 
+  *) mod_cgi: Remove block on OPTIONS method so that scripts can
+     respond to OPTIONS directly rather than via server default.
+     [Roy Fielding] PR 15242
+
 Changes with Apache 1.3.34
 
   *) hsregex: fix potential core dumping on 64 bit machines, such as

diff --git a/src/modules/standard/mod_cgi.c b/src/modules/standard/mod_cgi.c
index 7eab2d2d386a381ca2fa89bed57803630a7245e3..272b54334cc6aab4a9a649f5fa58c6565509dd03 100644 (file)
--- a/src/modules/standard/mod_cgi.c
+++ b/src/modules/standard/mod_cgi.c
@@ -337,13 +337,6 @@ static int cgi_handler(request_rec *r)
 
     struct cgi_child_stuff cld;
 
-    if (r->method_number == M_OPTIONS) {
-       /* 99 out of 100 CGI scripts, this is all they support */
-       r->allowed |= (1 << M_GET);
-       r->allowed |= (1 << M_POST);
-       return DECLINED;
-    }
-
     if ((argv0 = strrchr(r->filename, '/')) != NULL)
        argv0++;
     else