summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-23 23:07:37 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-23 23:07:37 (GMT)
commit3df58d11be781c6842d64bb5e8d591659e1f5c0b (patch)
treec1bfbbd0af6756dfec3aaa88d1016889e5415116 /Misc
parent07072168fb939e594e47d90a4af938cc46eb6217 (diff)
downloadcpython-3df58d11be781c6842d64bb5e8d591659e1f5c0b.zip
cpython-3df58d11be781c6842d64bb5e8d591659e1f5c0b.tar.gz
cpython-3df58d11be781c6842d64bb5e8d591659e1f5c0b.tar.bz2
Merged revisions 80423 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80423 | antoine.pitrou | 2010-04-24 00:54:59 +0200 (sam., 24 avril 2010) | 4 lines Issue #7943: Fix circular reference created when instantiating an SSL socket. Initial patch by Péter Szabó. ........
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 1caa20f..84292b1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -701,6 +701,7 @@ Andrew Svetlov
Kalle Svensson
Paul Swartz
Thenault Sylvain
+Péter Szabó
Arfrever Frehtes Taifersar Arahesis
Geoff Talvola
William Tanksley
diff --git a/Misc/NEWS b/Misc/NEWS
index 625221a..2911096 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@ Core and Builtins
Library
-------
+- Issue #7943: Fix circular reference created when instantiating an SSL
+ socket. Initial patch by Péter Szabó.
+
- Issue #8108: Fix the unwrap() method of SSL objects when the socket has
a non-infinite timeout. Also make that method friendlier with applications
wanting to continue using the socket in clear-text mode, by disabling