diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2016-12-22 19:44:37 +0000 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2016-12-22 19:44:37 +0000 |
commit | ca85a3678f2594b80a131fa05a55fd1bd7aa06db (patch) | |
tree | 295b5d9002c6d6483b5d71eb8d7ad7b0d2392967 | |
parent | 73c83059ec81bf3b4ef3ee317289b7ca83d5d1e4 (diff) | |
download | httpd-ca85a3678f2594b80a131fa05a55fd1bd7aa06db.tar.gz |
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@1775718 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | server/protocol.c | 5 |
2 files changed, 7 insertions, 1 deletions
@@ -7,6 +7,9 @@ Changes with Apache 2.2.32 *) core: Enforce LimitRequestFieldSize after multiple headers with the same name have been merged. [Stefan Fritsch] + *) core: Support custom ErrorDocuments for HTTP 501 and 414 status codes. + PR 57167 [Edward Lu <Chaosed0 gmail.com>] + Changes with Apache 2.2.31 *) Correct win32 build issues for mod_proxy exports, OpenSSL 1.0.x headers. diff --git a/server/protocol.c b/server/protocol.c index f49f38690c..4bb3bef2f1 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -983,9 +983,12 @@ request_rec *ap_read_request(conn_rec *conn) ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "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_run_log_transaction(r); + r = NULL; apr_brigade_destroy(tmp_bb); return r; } |