From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 30 Jul 2018 10:14:42 +0000 (+0000)
Subject: mod_proxy_http: follow up to r1836588: nonblocking read for 100-continue body.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2429
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35019799d6e677dfc656365d47982bf44e513370;p=thirdparty%2Fapache%2Fhttpd.git

mod_proxy_http: follow up to r1836588: nonblocking read for 100-continue body.

Set nonblocking read (req->flushall) when handling 100-continue since no body
is expected to be there already.


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

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 941e2325ae3..f7eaab3b9dc 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -2141,15 +2141,14 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker,
          * req->expecting_100 (i.e. cleared only if mod_proxy_http sent the
          * "100 Continue" according to its policy).
          */
-        req->do_100_continue = 1;
+        req->do_100_continue = req->flushall = 1;
         req->expecting_100 = r->expecting_100;
         r->expecting_100 = 0;
     }
-
     /* Should we block while prefetching the body or try nonblocking and flush
      * data to the backend ASAP?
      */
-    if (apr_table_get(r->subprocess_env, "proxy-flushall")) {
+    else if (apr_table_get(r->subprocess_env, "proxy-flushall")) {
         req->flushall = 1;
     }