summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-25 22:01:43 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-25 22:01:43 (GMT)
commit3bcba8e2889708f646df50953cd45a4f2cf28b02 (patch)
tree4edf42c36426da21843674f41a170c1e10368877 /Misc
parenta23831ff44e0178006a0039d218d60252d5bd755 (diff)
downloadcpython-3bcba8e2889708f646df50953cd45a4f2cf28b02.zip
cpython-3bcba8e2889708f646df50953cd45a4f2cf28b02.tar.gz
cpython-3bcba8e2889708f646df50953cd45a4f2cf28b02.tar.bz2
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. ........
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 fb97f53..e72463a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -339,6 +339,11 @@ C-API
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).