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

diff --git a/CHANGES b/CHANGES
index dc6def4b30fffa8bec5a91f7ecde6aaa073cb9e6..34cb3ed2fdb5966bf8a6885fa4f3b19e35d91259 100644 (file)
--- 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 82bd0f6a69e82c3decf9b789743529c31d5c0406..b98600185c16c930f7409c3bd8262448c78d1dac 100644 (file)
--- 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 e1ef204900f722476fbd8362bc84c2c0fb20fa7c..30553e536d6eea7c6455ef6af411efa5d4eb6388 100644 (file)
--- 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) {