Merged revisions 80540 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80540 | antoine.pitrou | 2010-04-27 21:09:59 +0200 (mar., 27 avril 2010) | 4 lines
Issue #8549: Fix compiling the _ssl extension under AIX. Patch by
Sridhar Ratnakumar.
........
diff --git a/Misc/ACKS b/Misc/ACKS
index 84292b1..09de7aa 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -581,6 +581,7 @@
Anders Qvist
Burton Radons
Antti Rasinen
+Sridhar Ratnakumar
Eric Raymond
Edward K. Ream
Chris Rebert
diff --git a/Misc/NEWS b/Misc/NEWS
index f24a188..359a3c3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@
Library
-------
+- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by
+ Sridhar Ratnakumar.
+
- 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
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index b59ee7c..31a7bd9 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -65,7 +65,7 @@
PY_SSL_VERSION_SSL2,
PY_SSL_VERSION_SSL3,
PY_SSL_VERSION_SSL23,
- PY_SSL_VERSION_TLS1,
+ PY_SSL_VERSION_TLS1
};
/* Include symbols from _socket module */