Merged revisions 80484 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80484 | antoine.pitrou | 2010-04-25 23:40:32 +0200 (dim., 25 avril 2010) | 6 lines
Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown,
where the method could block indefinitely if called just before the
event loop started running. This also fixes the occasional freezes
witnessed in test_httpservers.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index fb97f53..e72463a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -339,6 +339,11 @@
Library
-------
+- Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown,
+ where the method could block indefinitely if called just before the
+ event loop started running. This also fixes the occasional freezes
+ witnessed in test_httpservers.
+
- Issue #8524: When creating an SSL socket, the timeout value of the
original socket wasn't retained (instead, a socket with a positive timeout
would be turned into a non-blocking SSL socket).