diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 19:13:23 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 19:13:23 (GMT) |
| commit | bcc17e7223fe4378127b054aade28a1bfa0536e5 (patch) | |
| tree | 5ce9c93e89eb6f5814b2aa48f0245085fef1b042 | |
| parent | a7baa4bcff5e7fa9cc176d5bbd916a93d1b2b469 (diff) | |
| download | cpython-bcc17e7223fe4378127b054aade28a1bfa0536e5.zip cpython-bcc17e7223fe4378127b054aade28a1bfa0536e5.tar.gz cpython-bcc17e7223fe4378127b054aade28a1bfa0536e5.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
@@ -581,6 +581,7 @@ Brian Quinlan Anders Qvist Burton Radons Antti Rasinen +Sridhar Ratnakumar Eric Raymond Edward K. Ream Chris Rebert @@ -33,6 +33,9 @@ Core and Builtins Library ------- +- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by + Sridhar Ratnakumar. + - Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown, where the method could block indefinitely if called just before the event loop started running. This also fixes the occasional freezes diff --git a/Modules/_ssl.c b/Modules/_ssl.c index b59ee7c..31a7bd9 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -65,7 +65,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 */ |