]> granicus.if.org Git - apache/commit
Merge r1523387 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 4 Feb 2014 14:22:18 +0000 (14:22 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 4 Feb 2014 14:22:18 +0000 (14:22 +0000)
commit1f54be95da2e324f40766bbb4d6f4bf62e79cd2b
treea05af35449b65b257a8f39377cf23131d3480257
parent4c27c0f81e113128d193ef333a17441c2e480eba
Merge r1523387 from trunk:

In 2.4, the MPM leaves a copy of the non-disconnected FD sitting in
context->accept_socket. This FD will be closed a second time, often
shortly after a worker picks it up in this same FD being reused.  The
first recv fails with WSAENOTSOCK since the same FD was closed in the
listener thread while the worker was pulling it off the queue

(The second close is of the underlying FD/socket, not a shared
apr_socket_t, so it's not short-circuited)

This patch makes it a bit more 2.2.x-ish and solves my problem -- the
context->accept_socket gets zapped at the bottom of the loop if
!disconnected.

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1564313 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
server/mpm/winnt/child.c