From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 27 Apr 2010 19:14:15 +0000 (+0000)
Subject: Merged revisions 80540 via svnmerge from
X-Git-Tag: v3.2a1~988
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06e34a9476f7b0cd14b1dcc023892d7193230703;p=thirdparty%2FPython%2Fcpython.git

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 33e879fcec98..8755409bd262 100644
--- 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 852cc4fcfd9e..2837ef9fe16e 100644
--- 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 e89e5b776a9d..75792866a064 100644
--- 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 */