diff options
| author | Jeff Trawick <trawick@apache.org> | 2013-11-26 18:11:51 +0100 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2013-11-26 18:11:51 +0100 |
| commit | 88e5f7cc408f14b53dd654e6fee006d3458335ff (patch) | |
| tree | e5918cc87294cff0bf96827c65b633972d332232 /server/mpm/eventopt/eventopt.c | |
| parent | Fix error (diff) | |
| download | apache2-88e5f7cc408f14b53dd654e6fee006d3458335ff.tar.xz apache2-88e5f7cc408f14b53dd654e6fee006d3458335ff.zip | |
Follow-up to r1538490:
Ensure that conn_rec->sbh is always cleared when returning from process_socket().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545736 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/eventopt/eventopt.c')
| -rw-r--r-- | server/mpm/eventopt/eventopt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server/mpm/eventopt/eventopt.c b/server/mpm/eventopt/eventopt.c index 000f265de3..0cdbc34c05 100644 --- a/server/mpm/eventopt/eventopt.c +++ b/server/mpm/eventopt/eventopt.c @@ -1080,6 +1080,7 @@ read_request: pollset_op_t *v = ap_equeue_writer_value(eq); cs->expiration_time = ap_server_conf->timeout + apr_time_now(); + c->sbh = NULL; cs->pfd.reqevents = ( cs->pub.sense == CONN_SENSE_WANT_READ ? APR_POLLIN : APR_POLLOUT) | APR_POLLHUP | APR_POLLERR; @@ -1108,6 +1109,7 @@ read_request: if (cs->pub.state == CONN_STATE_LINGER) { if (!start_lingering_close_blocking(cs, eq)) { + c->sbh = NULL; return; } } |