]> granicus.if.org Git - apache/commitdiff
mpm_event: follow up to r1823047.
authorYann Ylavic <ylavic@apache.org>
Fri, 16 Feb 2018 12:31:28 +0000 (12:31 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 16 Feb 2018 12:31:28 +0000 (12:31 +0000)
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

server/mpm/event/event.c

index facc1c0454b5ee920731d802de26b4e79350b2c5..0855640b82f6a9cdfa23f7ed799fdff21c1aa62a 100644 (file)
@@ -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;