From: Ruediger Pluem <rpluem@apache.org>
Date: Tue, 20 Dec 2016 08:59:06 +0000 (+0000)
Subject: Merge r892808 from trunk:
X-Git-Tag: 2.2.32~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1f19b080b5dd879948f9c5da2c656c65f056f00;p=thirdparty%2Fapache%2Fhttpd.git

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 f51593a693c..ad111c78a35 100644
--- 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 a05ece13143..6ce98cc1655 100644
--- 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;
     }