diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 19:14:15 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 19:14:15 (GMT) |
| commit | 06e34a9476f7b0cd14b1dcc023892d7193230703 (patch) | |
| tree | dde60aae22a2067512784319d81e02308bc0a675 | |
| parent | 05830aa4ff84c9e51b64352945f82a9991a7bb73 (diff) | |
| download | cpython-06e34a9476f7b0cd14b1dcc023892d7193230703.zip cpython-06e34a9476f7b0cd14b1dcc023892d7193230703.tar.gz cpython-06e34a9476f7b0cd14b1dcc023892d7193230703.tar.bz2 | |
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
@@ -623,6 +623,7 @@ Anders Qvist Burton Radons Brodie Rao Antti Rasinen +Sridhar Ratnakumar Eric Raymond Edward K. Ream Chris Rebert @@ -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 e89e5b7..7579286 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 */ |