diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 19:18:34 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 19:18:34 (GMT) |
| commit | 79ac78afeff25cd277f4271f8605f29f30fbbdf8 (patch) | |
| tree | f9ec66081382b2978139d0f3f30521b67fdeccb3 | |
| parent | 097d1b709a63e2a3fc1eed2170a2e9b506b20a7d (diff) | |
| download | cpython-79ac78afeff25cd277f4271f8605f29f30fbbdf8.zip cpython-79ac78afeff25cd277f4271f8605f29f30fbbdf8.tar.gz cpython-79ac78afeff25cd277f4271f8605f29f30fbbdf8.tar.bz2 | |
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.
........
................
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_ssl.c | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -605,6 +605,7 @@ Anders Qvist Burton Radons Brodie Rao Antti Rasinen +Sridhar Ratnakumar Eric Raymond Edward K. Ream Chris Rebert @@ -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 c21ac5d..8b21abf 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 */ |