diff options
| author | Eric Covener <covener@apache.org> | 2014-11-14 03:24:40 +0100 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2014-11-14 03:24:40 +0100 |
| commit | c2d42b1214c61351ddde73afe3fb76b5c7b76b1b (patch) | |
| tree | 21864e908bfc284dcfbdf0bc8344963153f6841e /server/mpm/event/event.c | |
| parent | avoid dereferencing a recently apr_pool_clear()'ed event_conn_state_t *cs (diff) | |
| download | apache2-c2d42b1214c61351ddde73afe3fb76b5c7b76b1b.tar.xz apache2-c2d42b1214c61351ddde73afe3fb76b5c7b76b1b.zip | |
revert r1638691, more comprehensive followup planned shortly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1639564 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | server/mpm/event/event.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 692119ba15..436cf56eb6 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -1137,9 +1137,8 @@ read_request: } if (cs->pub.state == CONN_STATE_LINGER) { - if (start_lingering_close_blocking(cs)) { - notify_suspend(cs); - } + start_lingering_close_blocking(cs); + notify_suspend(cs); } else if (cs->pub.state == CONN_STATE_CHECK_REQUEST_LINE_READABLE) { /* It greatly simplifies the logic to use a single timeout value here |