www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Return METHOD_NOT_ALLOWED, not FORBIDDEN, to a TRACE request when

Browse Source 
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
This commit is contained in:
Nick Kew
2007-02-14 13:34:38 +00:00
parent 45c507dd7c
commit d14f70a89f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/http/http_filters.c
View File

@@ -857,7 +857,7 @@ AP_DECLARE_NONSTD(int) ap_send_http_trace(request_rec *r)
if (conf->trace_enable == AP_TRACE_DISABLE) { if (conf->trace_enable == AP_TRACE_DISABLE) {
apr_table_setn(r->notes, "error-notes", apr_table_setn(r->notes, "error-notes",
"TRACE denied by server configuration"); "TRACE denied by server configuration");
return HTTP_FORBIDDEN; return HTTP_METHOD_NOT_ALLOWED;
} }
if (conf->trace_enable == AP_TRACE_EXTENDED) if (conf->trace_enable == AP_TRACE_EXTENDED)

2
modules/proxy/mod_proxy.c
View File

@@ -744,7 +744,7 @@ static int proxy_handler(request_rec *r)
apr_table_setn(r->notes, "verbose-error-to", "*"); apr_table_setn(r->notes, "verbose-error-to", "*");
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"proxy: TRACE forbidden by server configuration"); "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 /* Can't test ap_should_client_block, we aren't ready to send