Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Antoine Pitrou 2010-04-27 19:13:23 +00:00
parent a7baa4bcff
commit bcc17e7223
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/ACKS
View File

@ -581,6 +581,7 @@ Brian Quinlan
Anders Qvist Anders Qvist
Burton Radons Burton Radons
Antti Rasinen Antti Rasinen
Sridhar Ratnakumar
Eric Raymond Eric Raymond
Edward K. Ream Edward K. Ream
Chris Rebert Chris Rebert

3
Misc/NEWS
View File

@ -33,6 +33,9 @@ Core and Builtins
Library Library
------- -------
- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by
Sridhar Ratnakumar.
- Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown, - Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown,
where the method could block indefinitely if called just before the where the method could block indefinitely if called just before the
event loop started running. This also fixes the occasional freezes event loop started running. This also fixes the occasional freezes

2
Modules/_ssl.c
View File

@ -65,7 +65,7 @@ enum py_ssl_version {
PY_SSL_VERSION_SSL2, PY_SSL_VERSION_SSL2,
PY_SSL_VERSION_SSL3, PY_SSL_VERSION_SSL3,
PY_SSL_VERSION_SSL23, PY_SSL_VERSION_SSL23,
PY_SSL_VERSION_TLS1, PY_SSL_VERSION_TLS1
}; };
/* Include symbols from _socket module */ /* Include symbols from _socket module */