From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 29 Aug 2016 22:19:25 +0000 (+0000)
Subject: Calm some overly agressive crlf handling
X-Git-Tag: 2.5.0-alpha~1181
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09fcfe627fb1b21477bbca02bc8d5380873ea658;p=thirdparty%2Fapache%2Fhttpd.git

Calm some overly agressive crlf handling

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758305 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/protocol.c b/server/protocol.c
index 875bcbba66e..a674c92d09e 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -329,7 +329,7 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n,
         }
     }
 
-    if (last_char <= *s || last_char[-1] != APR_ASCII_CR) {
+    if (crlf && (last_char <= *s || last_char[-1] != APR_ASCII_CR)) {
         *last_char = '\0';
         bytes_handled = last_char - *s;
         *read = bytes_handled;