summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-25 22:26:08 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-25 22:26:08 (GMT)
commite3123915297da3e87f6d62c0e0788a6b5421a5cf (patch)
treef29aeb87761b4ba6b87b9cfbc99b6bbbececee44 /Misc
parentd5781076ebff95e4d1a7054d77fb87041675baf1 (diff)
downloadcpython-e3123915297da3e87f6d62c0e0788a6b5421a5cf.zip
cpython-e3123915297da3e87f6d62c0e0788a6b5421a5cf.tar.gz
cpython-e3123915297da3e87f6d62c0e0788a6b5421a5cf.tar.bz2
Merged revisions 80487,80489 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80487 | antoine.pitrou | 2010-04-26 00:01:43 +0200 (lun., 26 avril 2010) | 12 lines 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. ........ ................ r80489 | antoine.pitrou | 2010-04-26 00:19:43 +0200 (lun., 26 avril 2010) | 9 lines Merged revisions 80480 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80480 | antoine.pitrou | 2010-04-25 23:15:50 +0200 (dim., 25 avril 2010) | 3 lines Replace a Lock with a better suited Event. ........ ................
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS5
1 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index dd02c3d..ae87ebe 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,11 @@ Core and Builtins
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).