Merge r892808 from trunk:

Fix up r892678 as pointed out by rpluem.

Submitted by: niq
Reviewed by: covener, jchampion, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1775232 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index f51593a693ce0e282b8834488c3bcc15248112e7..ad111c78a354e6558b2942a581e6455fa1d23472 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -103,13 +103,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) core: http://svn.apache.org/viewvc?rev=892808&view=rev is missing on 2.2.x after
-           after this backport http://svn.apache.org/viewvc?rev=1758671&view=rev
-           PR60403.
-     2.4.x patch: https://svn.apache.org/r892808
-     2.2.x patch: 2.4 works
-     +1: covener, jchampion, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/server/protocol.c b/server/protocol.c
index a05ece13143a1ea150c51a2f572937720047542b..6ce98cc1655a5da17009e06be7bbdf28a4c3f0e8 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -436,7 +436,7 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n,
     *read = bytes_handled;
 
     /* PR#43039: We shouldn't accept NULL bytes within the line */
-    if (strlen(*s) < bytes_handled - 1) {
+    if (strlen(*s) < bytes_handled) {
         return APR_EINVAL;
     }