summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2003-01-27 22:22:50 (GMT)
committerGuido van Rossum <guido@python.org>2003-01-27 22:22:50 (GMT)
commit99d4abf8a27fee6531a5abb76c7a6ff875f547c2 (patch)
tree405954124e899e466bd21689fb6bc6ee29450eb3 /Misc
parent5a2d8f5e9af0cbd513f02eb5576ff497e3693ffe (diff)
downloadcpython-99d4abf8a27fee6531a5abb76c7a6ff875f547c2.zip
cpython-99d4abf8a27fee6531a5abb76c7a6ff875f547c2.tar.gz
cpython-99d4abf8a27fee6531a5abb76c7a6ff875f547c2.tar.bz2
Support socket timeout in SSL, by Geoff Talvola.
(SF patch #675750, to fix SF bug #675552.)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 8cd1459..51aff58 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -516,6 +516,7 @@ Michael Stone
Ken Stox
Daniel Stutzbach
Paul Swartz
+Geoff Talvola
William Tanksley
Christian Tanzer
Amy Taylor
diff --git a/Misc/NEWS b/Misc/NEWS
index c88537b..971cfe0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,9 @@ Core and builtins
Extension modules
-----------------
+- The SSL module now handles sockets with a timeout set correctly (SF
+ patch #675750, fixing SF bug #675552).
+
- A new module _iconv_codec has been added, to expose the iconv(3)
library.