Commit 315009b6 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Backports: r1635762 

Submitted By: Edward Lu <Chaosed0 gmail.com>
Support custom ErrorDocuments for HTTP 501 and 414 status codes.
PR 57167 [Edward Lu <Chaosed0 gmail.com>]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775776 13f79535-47bb-0310-9956-ffa450edef68
parent 7c685e90

CHANGES

+3 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,9 @@ Changes with Apache 2.2.32 
  *) core: Avoid a possible truncation of the faulty header included in the

  *) core: Avoid a possible truncation of the faulty header included in the

     HTML response when LimitRequestFieldSize is reached.  [Yann Ylavic]

     HTML response when LimitRequestFieldSize is reached.  [Yann Ylavic]





  *) core: Support custom ErrorDocuments for HTTP 501 and 414 status codes.

     PR 57167 [Edward Lu <Chaosed0 gmail.com>]



Changes with Apache 2.2.31

Changes with Apache 2.2.31





  *) Correct win32 build issues for mod_proxy exports, OpenSSL 1.0.x headers.

  *) Correct win32 build issues for mod_proxy exports, OpenSSL 1.0.x headers.

server/protocol.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -964,9 +964,12 @@ request_rec *ap_read_request(conn_rec *conn) 
                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

                              "request failed: invalid characters in URI");

                              "request failed: invalid characters in URI");

            }

            }

            ap_send_error_response(r, 0);

            access_status = r->status;

            r->status = HTTP_OK;

            ap_die(access_status, r);

            ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);

            ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);

            ap_run_log_transaction(r);

            ap_run_log_transaction(r);

            r = NULL;

            apr_brigade_destroy(tmp_bb);

            apr_brigade_destroy(tmp_bb);

            return r;

            return r;

        }

        }