summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-01-16 18:41:36 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-01-16 18:41:36 (GMT)
commit2e8ec222420e1df41f20f0c364d74718ba55d01e (patch)
treea3ae567f3aea61d746f3191a0485e9594e2f6254
parentf7fb7626d925bc9457d6d08580758dcb6a8adaf0 (diff)
downloadcpython-2e8ec222420e1df41f20f0c364d74718ba55d01e.zip
cpython-2e8ec222420e1df41f20f0c364d74718ba55d01e.tar.gz
cpython-2e8ec222420e1df41f20f0c364d74718ba55d01e.tar.bz2
More SSL-related stuff
-rw-r--r--Doc/whatsnew/3.2.rst12
1 files changed, 12 insertions, 0 deletions
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index d643c75..d9823ca 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -1194,6 +1194,14 @@ as recommended in public uses of HTTPS.
(Added by Antoine Pitrou, :issue:`9003`.)
+imaplib
+-------
+
+Support for explicit TLS on standard IMAP4 connections has been added through
+the new :mod:`imaplib.IMAP4.starttls` method.
+
+(Contributed by Lorenzo M. Catucci and Antoine Pitrou, :issue:`4471`.)
+
unittest
--------
@@ -1904,3 +1912,7 @@ require changes to your code:
(Contributed by Antoine Pitrou, :issue:`10711`.)
+* SSL sockets in timeout mode now raise :exc:`socket.timeout` when a timeout
+ occurs, rather than a generic :exc:`~ssl.SSLError`.
+
+ (Contributed by Antoine Pitrou, :issue:`10272`.)