From 791f84b06daae57259ecafd1e43a5f2b3a5bfe8f Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Fri, 31 Oct 2014 13:17:38 +0000 Subject: [PATCH] Support custom ErrorDocuments for HTTP 501 and 414 status codes. PR 57167 [Edward Lu ] Submitted By: Edward Lu Committed By: covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1635762 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ server/protocol.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index a238ebdbb3..ce9b217a5b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) core: Support custom ErrorDocuments for HTTP 501 and 414 status codes. + PR 57167 [Edward Lu ] + *) mod_proxy_connect: Don't issue AH02447 on sockets hangups, let the read determine whether it is a normal close or a real error. PR 57168. [Yann Ylavic] diff --git a/server/protocol.c b/server/protocol.c index 9e65fe3c28..9146896052 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -1063,9 +1063,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; case HTTP_REQUEST_TIME_OUT: -- 2.40.0