You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/05/12 12:21:19 UTC
svn commit: r1481512 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
server/protocol.c
Author: minfrin
Date: Sun May 12 10:21:18 2013
New Revision: 1481512
URL: http://svn.apache.org/r1481512
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/protocol.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1433613
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1481512&r1=1481511&r2=1481512&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun May 12 10:21:18 2013
@@ -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]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1481512&r1=1481511&r2=1481512&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun May 12 10:21:18 2013
@@ -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)
Modified: httpd/httpd/branches/2.4.x/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/protocol.c?rev=1481512&r1=1481511&r2=1481512&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/protocol.c (original)
+++ httpd/httpd/branches/2.4.x/server/protocol.c Sun May 12 10:21:18 2013
@@ -964,7 +964,7 @@ request_rec *ap_read_request(conn_rec *c
|| 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) {