mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 80542 via svnmerge from

Browse source 
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.
  ........
................
This commit is contained in:
Antoine Pitrou 2010-04-27 19:18:34 +00:00
parent 097d1b709a
commit 79ac78afef
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/ACKS
View file

@ -605,6 +605,7 @@ Anders Qvist
Burton Radons Burton Radons
Brodie Rao Brodie Rao
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

@ -40,6 +40,9 @@ Core and Builtins
Library 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 - Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates
and bytes strings for environment keys and values, and use and bytes strings for environment keys and values, and use
sys.getfilesystemencoding() instead of sys.getdefautltencoding() sys.getfilesystemencoding() instead of sys.getdefautltencoding()

2
Modules/_ssl.c
View file

@ -66,7 +66,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 */