From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 22 Dec 2016 18:40:56 +0000 (+0000)
Subject: Backports: r892808
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a9f8241a85bbcdade0d982ffb111542b270f399;p=thirdparty%2Fapache%2Fhttpd.git

Backports: r892808
Submitted by: rpluem
Fix up r892678



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

diff --git a/server/protocol.c b/server/protocol.c
index 84d60983a5f..f1683295682 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;
     }