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 12:30:59 UTC
svn commit: r1824862 - in /httpd/httpd/trunk: include/ap_mmn.h
server/mpm/event/event.c
Author: ylavic
Date: Tue Feb 20 12:30:59 2018
New Revision: 1824862
URL: http://svn.apache.org/viewvc?rev=1824862&view=rev
Log:
mpm_event: follow up to r1823047 and r1824464.
MMN bump for CONN_STATE_NUM, plus don't consider CONN_STATE_LINGER_* as valid
states returned process_connection (never have been).
Modified:
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/server/mpm/event/event.c
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1824862&r1=1824861&r2=1824862&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Tue Feb 20 12:30:59 2018
@@ -569,6 +569,7 @@
* ap_regcomp_set_default_cflags and
* ap_regcomp_default_cflag_by_name
* 20171014.7 (2.5.1-dev) Add AP_CORE_DEFAULT macro
+ * 20171014.8 (2.5.1-dev) Add CONN_STATE_NUM to enum conn_state_e
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -576,7 +577,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20171014
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 7 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 8 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1824862&r1=1824861&r2=1824862&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Tue Feb 20 12:30:59 2018
@@ -1087,9 +1087,6 @@ 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;
}
@@ -1124,7 +1121,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)) {