From: Antoine Pitrou Date: Tue, 27 Apr 2010 19:18:34 +0000 (+0000) Subject: Merged revisions 80542 via svnmerge from X-Git-Tag: v3.1.3rc1~853 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79ac78afeff25cd277f4271f8605f29f30fbbdf8;p=python 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 410158aa40..b8d1dee65e 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -605,6 +605,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 9040939989..873f86a480 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,9 @@ Core and Builtins 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 c21ac5d380..8b21abf25d 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 */