You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2007/02/14 14:34:39 UTC
svn commit: r507526 - in /httpd/httpd/trunk/modules: http/http_filters.c
proxy/mod_proxy.c
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
Re: svn commit: r507526 - in /httpd/httpd/trunk/modules: http/http_filters.c
proxy/mod_proxy.c
Posted by Graham Leggett <mi...@sharp.fm>.
William A. Rowe, Jr. wrote:
> 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.
+1.
Regards,
Graham
--
Re: svn commit: r507526 - in /httpd/httpd/trunk/modules: http/http_filters.c
proxy/mod_proxy.c
Posted by Graham Leggett <mi...@sharp.fm>.
William A. Rowe, Jr. wrote:
> 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.
+1.
Regards,
Graham
--
Re: svn commit: r507526 - in /httpd/httpd/trunk/modules: http/http_filters.c
proxy/mod_proxy.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
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
>
>
>
>
Re: svn commit: r507526 - in /httpd/httpd/trunk/modules: http/http_filters.c
proxy/mod_proxy.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
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
>
>
>
>