From: Ruediger Pluem Date: Wed, 17 Feb 2016 15:47:03 +0000 (+0000) Subject: * c is set to cs->c. So use it. X-Git-Tag: 2.5.0-alpha~2053 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f48d0bb34bac8be7ecf1c5c2aa4edc65006f176;p=thirdparty%2Fapache%2Fhttpd.git * c is set to cs->c. So use it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730865 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index f50203c04ed..fa6a8119ea4 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -940,7 +940,7 @@ static int start_lingering_close_nonblocking(event_conn_state_t *cs) conn_rec *c = cs->c; apr_socket_t *csd = cs->pfd.desc.s; - if (ap_prep_lingering_close(cs->c) + if (ap_prep_lingering_close(c) || c->aborted || ap_shutdown_conn(c, 0) != APR_SUCCESS || c->aborted || apr_socket_shutdown(csd, APR_SHUTDOWN_WRITE) != APR_SUCCESS) {