summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-27 19:09:59 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-27 19:09:59 (GMT)
commit1dc6b08f9efe471cc5983cdfcdb391eea505a5e0 (patch)
treeb246e39742cac7fe78a41985c7a8a8cf649593e0
parent9bf5425f5f26a87f4724182d8e8537437666b596 (diff)
downloadcpython-1dc6b08f9efe471cc5983cdfcdb391eea505a5e0.zip
cpython-1dc6b08f9efe471cc5983cdfcdb391eea505a5e0.tar.gz
cpython-1dc6b08f9efe471cc5983cdfcdb391eea505a5e0.tar.bz2
Issue #8549: Fix compiling the _ssl extension under AIX. Patch by
Sridhar Ratnakumar.
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/_ssl.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index cb827da..af56dd4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -619,6 +619,7 @@ Anders Qvist
Burton Radons
Brodie Rao
Antti Rasinen
+Sridhar Ratnakumar
Eric Raymond
Edward K. Ream
Chris Rebert
diff --git a/Misc/NEWS b/Misc/NEWS
index 77fc78f..2c2d2f2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
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 e81c219..eef6588 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 */