httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1790972 - /httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c
Date Tue, 11 Apr 2017 13:41:05 GMT
Author: icing
Date: Tue Apr 11 13:41:05 2017
New Revision: 1790972

URL: http://svn.apache.org/viewvc?rev=1790972&view=rev
Log:
On the 2.4.x branch:

revert of r1790971, as done in wrong branch.


Modified:
    httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c

Modified: httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c?rev=1790972&r1=1790971&r2=1790972&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c Tue Apr 11 13:41:05 2017
@@ -817,8 +817,10 @@ static DWORD __stdcall worker_main(void
 
         if (!disconnected) {
             context->accept_socket = INVALID_SOCKET;
+            if (!c->aborted) { 
+                ap_lingering_close(c);
+            }
         }
-        ap_lingering_close(c);
     }
 
     ap_update_child_status_from_indexes(0, thread_num, SERVER_DEAD, NULL);



Mime
View raw message