From ab301c8f1de788bca9d90abb4d779f430eadf59e Mon Sep 17 00:00:00 2001 From: "Roy T. Fielding" Date: Tue, 18 Oct 2005 21:27:57 +0000 Subject: [PATCH] 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/2.0.x@326253 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ modules/generators/mod_cgi.c | 7 ------- modules/generators/mod_cgid.c | 7 ------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index 4d17685c155..ecab93d9d72 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c index 3a8ae8ef6b6..46e35575150 100644 --- a/modules/generators/mod_cgi.c +++ b/modules/generators/mod_cgi.c @@ -746,13 +746,6 @@ static int cgi_handler(request_rec *r) 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); diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c index 5dd50704dde..038a33a6cc4 100644 --- a/modules/generators/mod_cgid.c +++ b/modules/generators/mod_cgid.c @@ -1261,13 +1261,6 @@ static int cgid_handler(request_rec *r) 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"); -- 2.47.2