diff options
| author | Yann Ylavic <ylavic@apache.org> | 2018-02-20 14:32:48 +0100 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2018-02-20 14:32:48 +0100 |
| commit | 7c6effa44eddc961d6279d407d9d22510b1f3107 (patch) | |
| tree | 777519a89c2b8617b90c010e1e8f4c64351da6f9 | |
| parent | mpm_event: follow up to r1823047 and r1824464. (diff) | |
| download | apache2-7c6effa44eddc961d6279d407d9d22510b1f3107.tar.xz apache2-7c6effa44eddc961d6279d407d9d22510b1f3107.zip | |
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
| -rw-r--r-- | server/mpm/event/event.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index be3ce9fd99..84b2aa0501 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)) { |