[Python-checkins] Remove `ifdef` check for an OpenSSL version (0.9.6) we don't support (GH-6800)

Alex Gaynor webhook-mailer at python.org
Mon May 14 11:51:53 EDT 2018


https://github.com/python/cpython/commit/f04224210d93212bd9ad17d67ef5e1c70171a13e
commit: f04224210d93212bd9ad17d67ef5e1c70171a13e
branch: master
author: Alex Gaynor <alex.gaynor at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018-05-14T11:51:45-04:00
summary:

Remove `ifdef` check for an OpenSSL version (0.9.6) we don't support (GH-6800)

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 4baabd52bc9f..650f030345f7 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -919,11 +919,8 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
         BIO_up_ref(outbio->bio);
         SSL_set_bio(self->ssl, inbio->bio, outbio->bio);
     }
-    mode = SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER;
-#ifdef SSL_MODE_AUTO_RETRY
-    mode |= SSL_MODE_AUTO_RETRY;
-#endif
-    SSL_set_mode(self->ssl, mode);
+    SSL_set_mode(self->ssl,
+                 SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER | SSL_MODE_AUTO_RETRY);
 
     if (server_hostname != NULL) {
         if (_ssl_configure_hostname(self, server_hostname) < 0) {



More information about the Python-checkins mailing list