Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 37431 invoked from network); 14 Feb 2007 20:09:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Feb 2007 20:09:39 -0000 Received: (qmail 2124 invoked by uid 500); 14 Feb 2007 20:09:43 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 1930 invoked by uid 500); 14 Feb 2007 20:09:42 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 1918 invoked by uid 99); 14 Feb 2007 20:09:42 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Feb 2007 12:09:42 -0800 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (herse.apache.org: local policy) Received: from [64.202.165.224] (HELO smtpout06-04.prod.mesa1.secureserver.net) (64.202.165.224) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 14 Feb 2007 12:09:31 -0800 Received: (qmail 9281 invoked from network); 14 Feb 2007 20:09:10 -0000 Received: from unknown (24.15.193.17) by smtpout06-04.prod.mesa1.secureserver.net (64.202.165.227) with ESMTP; 14 Feb 2007 20:09:09 -0000 Message-ID: <45D36C48.6000000@rowe-clan.net> Date: Wed, 14 Feb 2007 14:08:40 -0600 From: "William A. Rowe, Jr." User-Agent: Thunderbird 1.5.0.9 (X11/20070102) MIME-Version: 1.0 To: dev@httpd.apache.org CC: cvs@httpd.apache.org Subject: Re: svn commit: r507526 - in /httpd/httpd/trunk/modules: http/http_filters.c proxy/mod_proxy.c References: <20070214133439.CB1ED1A981A@eris.apache.org> In-Reply-To: <20070214133439.CB1ED1A981A@eris.apache.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org NICE. I agree that this is more in-spec with 2616, so consider this my +1 for backport to 2.2, 2.0, 1.3 branches for whomever wants to apply this patch. niq@apache.org wrote: > Author: niq > Date: Wed Feb 14 05:34:38 2007 > New Revision: 507526 > > URL: http://svn.apache.org/viewvc?view=rev&rev=507526 > Log: > 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. > > Modified: > httpd/httpd/trunk/modules/http/http_filters.c > httpd/httpd/trunk/modules/proxy/mod_proxy.c > > Modified: httpd/httpd/trunk/modules/http/http_filters.c > URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?view=diff&rev=507526&r1=507525&r2=507526 > ============================================================================== > --- httpd/httpd/trunk/modules/http/http_filters.c (original) > +++ httpd/httpd/trunk/modules/http/http_filters.c Wed Feb 14 05:34:38 2007 > @@ -857,7 +857,7 @@ > 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) > > Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c > URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?view=diff&rev=507526&r1=507525&r2=507526 > ============================================================================== > --- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original) > +++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Wed Feb 14 05:34:38 2007 > @@ -744,7 +744,7 @@ > 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 > > > >