From: Nick Kew <niq@apache.org>
Date: Wed, 14 Feb 2007 13:34:38 +0000 (+0000)
Subject: Return METHOD_NOT_ALLOWED, not FORBIDDEN, to a TRACE request when
X-Git-Tag: 2.3.0~1904
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d14f70a89f0f8fc1cb991940e71f8c352825a32b;p=thirdparty%2Fapache%2Fhttpd.git

Return METHOD_NOT_ALLOWED, not FORBIDDEN, to a TRACE request when
TraceEnable is Off.  This agrees with our documentation, and with
our Allow: header in response to OPTIONS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@507526 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index a28fbafc1ed..cee5d70cf80 100644
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -857,7 +857,7 @@ AP_DECLARE_NONSTD(int) ap_send_http_trace(request_rec *r)
     if (conf->trace_enable == AP_TRACE_DISABLE) {
         apr_table_setn(r->notes, "error-notes",
                       "TRACE denied by server configuration");
-        return HTTP_FORBIDDEN;
+        return HTTP_METHOD_NOT_ALLOWED;
     }
 
     if (conf->trace_enable == AP_TRACE_EXTENDED)
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 4f87b23299c..a8b95f43659 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -744,7 +744,7 @@ static int proxy_handler(request_rec *r)
             apr_table_setn(r->notes, "verbose-error-to", "*");
             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                           "proxy: TRACE forbidden by server configuration");
-            return HTTP_FORBIDDEN;
+            return HTTP_METHOD_NOT_ALLOWED;
         }
 
         /* Can't test ap_should_client_block, we aren't ready to send