From: Eric Covener <covener@apache.org>
Date: Sun, 25 Aug 2013 18:59:42 +0000 (+0000)
Subject: In event's process_lingering_close, close the socket and remove it
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=316107a5148fb415b3c9e916f6ba4a6f7f98ad54;p=thirdparty%2Fapache%2Fhttpd.git

In event's process_lingering_close, close the socket and remove it
from the ring as soon as we see any status that isn't
APR_EAGAIN or APR_SUCCESS, instead of waiting specifically
for EOF.



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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 004f5230994..595425164a5 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1436,7 +1436,7 @@ static void process_lingering_close(event_conn_state_t *cs, const apr_pollfd_t *
         rv = apr_socket_recv(csd, dummybuf, &nbytes);
     } while (rv == APR_SUCCESS);
 
-    if (!APR_STATUS_IS_EOF(rv)) {
+    if (APR_STATUS_IS_EAGAIN(rv)) {
         return;
     }