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 be3ce9fd99045a14045e85861b36e88fb6b8b85c..84b2aa0501eb8d0ee9f4a809c88b4ff8ab33e679 100644 (file)
--- 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)) {