From: Eric Covener <covener@apache.org>
Date: Fri, 14 Nov 2014 02:24:40 +0000 (+0000)
Subject: revert r1638691, more comprehensive followup planned shortly.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a61813bd3ae4db9496784c45ae9bf56c86d34424;p=thirdparty%2Fapache%2Fhttpd.git

revert r1638691, more comprehensive followup planned shortly.



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

diff --git a/CHANGES b/CHANGES
index c33226fa6dd..740c9f6069f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,8 +5,6 @@ Changes with Apache 2.5.0
      mod_proxy_fcgi: Fix a potential crash with response headers' size above 8K.
      [Teguh <chain rop.io>, Yann Ylavic]
 
-  *) event: Resolve potential crashes under load after r1604350. [Eric Covener]
-
   *) mod_authnz_ldap: Resolve crashes with LDAP authz and non-LDAP authn since 
      r1608202. [Eric Covener]
  
diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 692119ba156..436cf56eb64 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1137,9 +1137,8 @@ read_request:
     }
 
     if (cs->pub.state == CONN_STATE_LINGER) {
-        if (start_lingering_close_blocking(cs)) { 
-            notify_suspend(cs);
-        }
+        start_lingering_close_blocking(cs);
+        notify_suspend(cs);
     }
     else if (cs->pub.state == CONN_STATE_CHECK_REQUEST_LINE_READABLE) {
         /* It greatly simplifies the logic to use a single timeout value here