From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 20 Apr 2018 11:07:23 +0000 (+0000)
Subject: core: forward flags to recursive/folding call to ap_rgetline_core().
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2671
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8eec46d1459844d38a02392e27cbf5318d73b34;p=thirdparty%2Fapache%2Fhttpd.git

core: forward flags to recursive/folding call to ap_rgetline_core().

We still need them when folding, other than AP_GETLINE_FOLD itself of course.



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

diff --git a/server/protocol.c b/server/protocol.c
index d744ce459ea..27611ed5089 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -464,8 +464,8 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n,
 
                     next_size = n - bytes_handled;
 
-                    rv = ap_rgetline_core(&tmp, next_size,
-                                          &next_len, r, 0, bb);
+                    rv = ap_rgetline_core(&tmp, next_size, &next_len, r,
+                                          flags & ~AP_GETLINE_FOLD, bb);
                     if (rv != APR_SUCCESS) {
                         goto cleanup;
                     }