From d8ac2aa5beb285c4af499c5141722a18d2754eea Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 11 Nov 2014 11:46:49 +0000 Subject: [PATCH] Merge r1635762 from trunk: Support custom ErrorDocuments for HTTP 501 and 414 status codes. PR 57167 [Edward Lu ] Submitted By: Edward Lu Committed By: covener Submitted by: covener Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1638071 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 5 ----- server/protocol.c | 5 ++++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index ef071c5c9b..a41a630f4d 100644 --- a/CHANGES +++ b/CHANGES @@ -13,6 +13,9 @@ Changes with Apache 2.4.11 request headers earlier. Adds "MergeTrailers" directive to restore legacy behavior. [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener] + *) core: Support custom ErrorDocuments for HTTP 501 and 414 status codes. + PR 57167 [Edward Lu ] + *) mod_proxy_connect: Fix ProxyRemote to https:// backends on EBCDIC systems. PR 57092 [Edward Lu ] diff --git a/STATUS b/STATUS index adf9e5e81a..0e2894805d 100644 --- a/STATUS +++ b/STATUS @@ -102,11 +102,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * core: Support custom ErrorDocuments for HTTP 501 and 414 status codes. - PR 57167 - trunk patch: http://svn.apache.org/r1635762 - 2.4.x patch: trunk works - +1 covener, ylavic, trawick PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/server/protocol.c b/server/protocol.c index 47af714fde..5acdb547e5 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -969,9 +969,12 @@ request_rec *ap_read_request(conn_rec *conn) ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00566) "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); goto traceout; } -- 2.50.1