Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Message-ID: <20051018212804.31588.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r326253 - in /httpd/httpd/branches/2.0.x: CHANGES
 modules/generators/mod_cgi.c modules/generators/mod_cgid.c
Date: Tue, 18 Oct 2005 21:28:03 -0000
To: cvs@httpd.apache.org
From: fielding@apache.org

Author: fielding
Date: Tue Oct 18 14:27:57 2005
New Revision: 326253

URL: http://svn.apache.org/viewcvs?rev=326253&view=rev
Log:
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.


Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/modules/generators/mod_cgi.c
    httpd/httpd/branches/2.0.x/modules/generators/mod_cgid.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=326253&r1=326252&r2=326253&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Tue Oct 18 14:27:57 2005
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.56
 
+  *) mod_cgi(d): Remove block on OPTIONS method so that scripts can
+     respond to OPTIONS directly rather than via server default.
+     [Roy Fielding] PR 15242
+
   *) Added new module mod_version, which provides version dependent
      configuration containers.  [André Malo]
 

Modified: httpd/httpd/branches/2.0.x/modules/generators/mod_cgi.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/generators/mod_cgi.c?rev=326253&r1=326252&r2=326253&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/generators/mod_cgi.c (original)
+++ httpd/httpd/branches/2.0.x/modules/generators/mod_cgi.c Tue Oct 18 14:27:57 2005
@@ -746,13 +746,6 @@
 
     p = r->main ? r->main->pool : r->pool;
 
-    if (r->method_number == M_OPTIONS) {
-        /* 99 out of 100 CGI scripts, this is all they support */
-        r->allowed |= (AP_METHOD_BIT << M_GET);
-        r->allowed |= (AP_METHOD_BIT << M_POST);
-        return DECLINED;
-    }
-
     argv0 = apr_filename_of_pathname(r->filename);
     nph = !(strncmp(argv0, "nph-", 4));
     conf = ap_get_module_config(r->server->module_config, &cgi_module);

Modified: httpd/httpd/branches/2.0.x/modules/generators/mod_cgid.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/generators/mod_cgid.c?rev=326253&r1=326252&r2=326253&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/generators/mod_cgid.c (original)
+++ httpd/httpd/branches/2.0.x/modules/generators/mod_cgid.c Tue Oct 18 14:27:57 2005
@@ -1261,13 +1261,6 @@
     if (strcmp(r->handler,CGI_MAGIC_TYPE) && strcmp(r->handler,"cgi-script"))
         return DECLINED;
 
-    if (r->method_number == M_OPTIONS) { 
-        /* 99 out of 100 cgid scripts, this is all they support */ 
-        r->allowed |= (AP_METHOD_BIT << M_GET); 
-        r->allowed |= (AP_METHOD_BIT << M_POST); 
-        return DECLINED; 
-    } 
-
     conf = ap_get_module_config(r->server->module_config, &cgid_module); 
     is_included = !strcmp(r->protocol, "INCLUDED");