From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 20 Feb 2018 13:32:48 +0000 (+0000)
Subject: mpm_event: follow up to r1823047 and r1824862.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2835
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c6effa44eddc961d6279d407d9d22510b1f3107;p=thirdparty%2Fapache%2Fhttpd.git

mpm_event: follow up to r1823047 and r1824862.

Revert (broken) functional change from r1824862.



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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index be3ce9fd990..84b2aa0501e 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1087,6 +1087,9 @@ read_request:
             if (clogging) {
                 apr_atomic_dec32(&clogged_count);
             }
+            if (cs->pub.state > CONN_STATE_LINGER) {
+                cs->pub.state = CONN_STATE_LINGER;
+            }
             if (rc == DONE) {
                 rc = OK;
             }
@@ -1121,7 +1124,7 @@ read_request:
      * worker or prefork MPMs for instance.
      */
     if (rc != OK || (cs->pub.state >= CONN_STATE_NUM)
-                 || (cs->pub.state != CONN_STATE_LINGER
+                 || (cs->pub.state < CONN_STATE_LINGER
                      && cs->pub.state != CONN_STATE_WRITE_COMPLETION
                      && cs->pub.state != CONN_STATE_CHECK_REQUEST_LINE_READABLE
                      && cs->pub.state != CONN_STATE_SUSPENDED)) {