You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/02/20 13:32:48 UTC
svn commit: r1824877 - /httpd/httpd/trunk/server/mpm/event/event.c
Author: ylavic
Date: Tue Feb 20 13:32:48 2018
New Revision: 1824877
URL: http://svn.apache.org/viewvc?rev=1824877&view=rev
Log:
mpm_event: follow up to r1823047 and r1824862.
Revert (broken) functional change from r1824862.
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1824877&r1=1824876&r2=1824877&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Tue Feb 20 13:32:48 2018
@@ -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)) {