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 84292b13e0c4fcc72939dace3749f69b064dfa75..09de7aae128b12c6fb2c811d4537d6eaa4fd5f2d 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -581,6 +581,7 @@ Brian Quinlan
 Anders Qvist
 Burton Radons
 Antti Rasinen
+Sridhar Ratnakumar
 Eric Raymond
 Edward K. Ream
 Chris Rebert

diff --git a/Misc/NEWS b/Misc/NEWS
index f24a188ee508ce89031b9ccd2a5c29dfbbabf27e..359a3c34612ae822772b74de94e22e8c57529c68 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@ Core and Builtins
 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 b59ee7ce6552cc3dcc29bc34fc2a3a868a30654f..31a7bd9b9ffd8c269f9ed9399e743090ff9daa94 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -65,7 +65,7 @@ enum py_ssl_version {
        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 */