]> granicus.if.org Git - python/commitdiff
Issue #8240: Set the SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER flag on SSL sockets.
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 25 May 2013 11:02:32 +0000 (13:02 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 25 May 2013 11:02:32 +0000 (13:02 +0200)
Misc/NEWS
Modules/_ssl.c

index 7a4ac3fba4c9796c17a296fc0e35d641fbe6b6e7..db9b8817fc8f38c294b0cd940ee2b28bf4d15cd2 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -96,6 +96,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #8240: Set the SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER flag on SSL
+  sockets.
+
 - Issue #17269: Workaround for socket.getaddrinfo crash on MacOS X
   with port None or "0" and flags AI_NUMERICSERV.
 
index c6493ba833ff9bce3f6c55ec97fbf75e38177f12..ca41bbfc691f79b204b8bc02b62224b8136c5da4 100644 (file)
@@ -490,9 +490,11 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
     PySSL_END_ALLOW_THREADS
     SSL_set_app_data(self->ssl,self);
     SSL_set_fd(self->ssl, sock->sock_fd);
+    SSL_set_mode(self->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER
 #ifdef SSL_MODE_AUTO_RETRY
-    SSL_set_mode(self->ssl, SSL_MODE_AUTO_RETRY);
+                 | SSL_MODE_AUTO_RETRY
 #endif
+                 );
 
 #if HAVE_SNI
     if (server_hostname != NULL)