Commit 69c1623f authored by Nick Kew's avatar Nick Kew
Browse files

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
parent 828478cf

modules/http/http_filters.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

modules/proxy/mod_proxy.c

+1 −1
Original line number Diff line number Diff line
@@ -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