Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch:
Changeset: r75903:c550e14a63bb
Date: 2015-02-15 19:46 +0100
http://bitbucket.org/pypy/pypy/changeset/c550e14a63bb/
Log: Issue #1985: SSL_OP_NO_COMPRESSION is not always defined. Should
help translation on OS/X.
diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -79,7 +79,8 @@
constants["OP_CIPHER_SERVER_PREFERENCE"] = SSL_OP_CIPHER_SERVER_PREFERENCE
constants["OP_SINGLE_DH_USE"] = SSL_OP_SINGLE_DH_USE
constants["OP_SINGLE_ECDH_USE"] = SSL_OP_SINGLE_ECDH_USE
-constants["OP_NO_COMPRESSION"] = SSL_OP_NO_COMPRESSION
+if SSL_NO_COMPRESSION is not None:
+ constants["OP_NO_COMPRESSION"] = SSL_OP_NO_COMPRESSION
constants["OPENSSL_VERSION_NUMBER"] = OPENSSL_VERSION_NUMBER
ver = OPENSSL_VERSION_NUMBER
diff --git a/rpython/rlib/ropenssl.py b/rpython/rlib/ropenssl.py
--- a/rpython/rlib/ropenssl.py
+++ b/rpython/rlib/ropenssl.py
@@ -96,7 +96,7 @@
"SSL_OP_SINGLE_DH_USE")
SSL_OP_SINGLE_ECDH_USE = rffi_platform.ConstantInteger(
"SSL_OP_SINGLE_ECDH_USE")
- SSL_OP_NO_COMPRESSION = rffi_platform.ConstantInteger(
+ SSL_OP_NO_COMPRESSION = rffi_platform.DefinedConstantInteger(
"SSL_OP_NO_COMPRESSION")
SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS = rffi_platform.ConstantInteger(
"SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS")
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
