From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 20 Feb 2018 12:30:59 +0000 (+0000)
Subject: mpm_event: follow up to r1823047 and r1824464.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2836
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a139dfa4ec97fe15844c4032308a3f62cb2177b;p=thirdparty%2Fapache%2Fhttpd.git

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).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824862 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 21bb75af70d..6393945ba68 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -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
diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 84b2aa0501e..be3ce9fd990 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -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)) {