Author: Matti Picus <matti.pi...@gmail.com> Branch: release-pypy3.6-v7.x Changeset: r98299:16b2e4be93b9 Date: 2019-12-16 07:52 +0200 http://bitbucket.org/pypy/pypy/changeset/16b2e4be93b9/
Log: merge py3.6 into branch diff --git a/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py b/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py --- a/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py +++ b/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py @@ -76,7 +76,6 @@ static const long SSL_OP_SINGLE_DH_USE; static const long SSL_OP_EPHEMERAL_RSA; static const long SSL_OP_MICROSOFT_SESS_ID_BUG; -static const long SSL_OP_ENABLE_MIDDLEBOX_COMPAT; static const long SSL_OP_NETSCAPE_CHALLENGE_BUG; static const long SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG; static const long SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG; _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit