Merged revisions 80542 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80542 | antoine.pitrou | 2010-04-27 21:14:15 +0200 (mar., 27 avril 2010) | 10 lines
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 410158a..b8d1dee 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -605,6 +605,7 @@
Burton Radons
Brodie Rao
Antti Rasinen
+Sridhar Ratnakumar
Eric Raymond
Edward K. Ream
Chris Rebert
diff --git a/Misc/NEWS b/Misc/NEWS
index 9040939..873f86a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,9 @@
Library
-------
+- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by
+ Sridhar Ratnakumar.
+
- Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates
and bytes strings for environment keys and values, and use
sys.getfilesystemencoding() instead of sys.getdefautltencoding()
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index c21ac5d..8b21abf 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -66,7 +66,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 */