From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 16 Feb 2018 12:31:28 +0000 (+0000)
Subject: mpm_event: follow up to r1823047.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2856
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5b3111059aa5c637e9c307881f5e84c5e8ce3ed;p=thirdparty%2Fapache%2Fhttpd.git

mpm_event: follow up to r1823047.

Update clogged counter on read_request retry too.



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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index facc1c0454b..0855640b82f 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1078,14 +1078,14 @@ static void process_socket(apr_thread_t *thd, apr_pool_t * p, apr_socket_t * soc
              * where they would otherwise read, or read where they would
              * otherwise write, should set the sense appropriately.
              */
+read_request:
             if (clogging) {
                 apr_atomic_inc32(&clogged_count);
             }
-read_request:
             rc = ap_run_process_connection(c);
             if (clogging) {
                 apr_atomic_dec32(&clogged_count);
-                clogging = 0;
+                clogging = c->clogging_input_filters;
             }
             if (cs->pub.state > CONN_STATE_LINGER) {
                 cs->pub.state = CONN_STATE_LINGER;