From afefc6e4d4f9f17aa0473e01d0987b6453dab057 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Sun, 12 May 2013 10:21:18 +0000 Subject: [PATCH] core: Improve error message where client's request-line exceeds LimitRequestLine PR 54384 trunk patch: http://svn.apache.org/r1433613 Submitted by: jailletc36 Reviewed by: minfrin, jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1481512 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 7 ------- server/protocol.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index dc6def4b30..34cb3ed2fd 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.5 + *) core: Improve error message where client's request-line exceeds + LimitRequestLine. PR 54384 [Christophe Jaillet] + *) mod_macro: New module that provides macros within configuration files. [Fabien Coelho] diff --git a/STATUS b/STATUS index 82bd0f6a69..b98600185c 100644 --- a/STATUS +++ b/STATUS @@ -90,13 +90,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - - * core: Improve error message where client's request-line exceeds LimitRequestLine - PR 54384 - trunk patch: http://svn.apache.org/r1433613 - 2.4.x patch: trunk patch applies - +1: minfrin, jim, jailletc36 - * mod_dav: Do not segfault on PROPFIND with a zero length DBM. PR 52559 trunk patch: http://svn.apache.org/r1476645 2.4.x patch: trunk patch works (minus CHANGES) diff --git a/server/protocol.c b/server/protocol.c index e1ef204900..30553e536d 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -964,7 +964,7 @@ request_rec *ap_read_request(conn_rec *conn) || r->status == HTTP_BAD_REQUEST) { if (r->status == HTTP_REQUEST_URI_TOO_LARGE) { ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00565) - "request failed: URI too long (longer than %d)", + "request failed: client's request-line exceeds LimitRequestLine (longer than %d)", r->server->limit_req_line); } else if (r->method == NULL) { -- 2.40.0