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 33e879fcec986dd35a4397d418ac336f660213c0..8755409bd2628e176b494351ce49b12f557925a9 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -623,6 +623,7 @@ Anders Qvist
 Burton Radons
 Brodie Rao
 Antti Rasinen
+Sridhar Ratnakumar
 Eric Raymond
 Edward K. Ream
 Chris Rebert

diff --git a/Misc/NEWS b/Misc/NEWS
index 852cc4fcfd9e54104cca29b7090fa8660f6c9bce..2837ef9fe16e113556e565176e3e9400e98bc149 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -339,6 +339,9 @@ C-API
 Library
 -------
 
+- Issue #8549: Fix compiling the _ssl extension under AIX.  Patch by
+  Sridhar Ratnakumar.
+
 - Issue #6656: fix locale.format_string to handle escaped percents
   and mappings.
 

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index e89e5b776a9d5716c76eee1ce7652a9e7b102ff5..75792866a06449f4f77221706f71cc32b18c317c 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -66,7 +66,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 */