From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 16 Feb 2018 13:02:27 +0000 (+0000)
Subject: mpm_event: follow up to r1823047: simplify "clogging" logic (reentrance).
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2853
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5aacf54e621e81acf32f062be3090aa5921f192;p=thirdparty%2Fapache%2Fhttpd.git

mpm_event: follow up to r1823047: simplify "clogging" logic (reentrance).



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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 0855640b82f..a58a552ce7d 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1070,22 +1070,22 @@ static void process_socket(apr_thread_t *thd, apr_pool_t * p, apr_socket_t * soc
         /* fall through */
     }
     else {
-        clogging = c->clogging_input_filters;
-        if (clogging || cs->pub.state == CONN_STATE_READ_REQUEST_LINE) {
+        if (cs->pub.state == CONN_STATE_READ_REQUEST_LINE
             /* If we have an input filter which 'clogs' the input stream,
              * like mod_ssl used to, lets just do the normal read from input
              * filters, like the Worker MPM does. Filters that need to write
              * where they would otherwise read, or read where they would
              * otherwise write, should set the sense appropriately.
              */
+             || c->clogging_input_filters) {
 read_request:
+            clogging = c->clogging_input_filters;
             if (clogging) {
                 apr_atomic_inc32(&clogged_count);
             }
             rc = ap_run_process_connection(c);
             if (clogging) {
                 apr_atomic_dec32(&clogged_count);
-                clogging = c->clogging_input_filters;
             }
             if (cs->pub.state > CONN_STATE_LINGER) {
                 cs->pub.state = CONN_STATE_LINGER;