Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 79449,79452 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79449 | antoine.pitrou | 2010-03-26 20:32:24 +0100 (ven., 26 mars 2010) | 12 lines

  Merged revisions 79448 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79448 | antoine.pitrou | 2010-03-26 20:27:16 +0100 (ven., 26 mars 2010) | 6 lines

    Issue #8222: Enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking
    reads and writes are always retried by OpenSSL itself.

    (this is a followup to issue #3890)
  ........
................
  r79452 | antoine.pitrou | 2010-03-26 20:36:14 +0100 (ven., 26 mars 2010) | 3 lines

  Add NEWS entry for r79449.
................
This commit is contained in:
Antoine Pitrou 2010-03-26 19:38:11 +00:00
parent b869749f55
commit ed6c893cfc
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -28,7 +28,9 @@ Library
didn't support chflags() (for example ZFS under FreeBSD). The error is
now silenced.
- Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
- Issue #3890, #8222: Fix recv() and recv_into() on non-blocking SSL sockets.
Also, enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking
reads and writes are always retried by OpenSSL itself.
- Issue #6716/2: Backslash-replace error output in compilall.

3
Modules/_ssl.c
View file

@ -9,8 +9,6 @@
directly.
XXX should partial writes be enabled, SSL_MODE_ENABLE_PARTIAL_WRITE?
XXX what about SSL_MODE_AUTO_RETRY?
*/
#include "Python.h"
@ -371,6 +369,7 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
self->ssl = SSL_new(self->ctx); /* New ssl struct */
PySSL_END_ALLOW_THREADS
SSL_set_fd(self->ssl, Sock->sock_fd); /* Set the socket for SSL */
SSL_set_mode(self->ssl, SSL_MODE_AUTO_RETRY);
/* If the socket is in non-blocking mode or timeout mode, set the BIO
* to non-blocking mode (blocking is the default)