Support socket timeout in SSL, by Geoff Talvola.
(SF patch #675750, to fix SF bug #675552.)
diff --git a/Misc/ACKS b/Misc/ACKS
index 8cd1459..51aff58 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -516,6 +516,7 @@
Ken Stox
Daniel Stutzbach
Paul Swartz
+Geoff Talvola
William Tanksley
Christian Tanzer
Amy Taylor
diff --git a/Misc/NEWS b/Misc/NEWS
index c88537b..971cfe0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,9 @@
Extension modules
-----------------
+- The SSL module now handles sockets with a timeout set correctly (SF
+ patch #675750, fixing SF bug #675552).
+
- A new module _iconv_codec has been added, to expose the iconv(3)
library.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index ad0b59b..0a42fe7 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -302,15 +302,58 @@
PyObject_Del(self);
}
+/* If the socket has a timeout, do a select() on the socket.
+ The argument writing indicates the direction.
+ Return non-zero if the socket timed out, zero otherwise.
+ */
+static int
+wait_for_timeout(PySocketSockObject *s, int writing)
+{
+ fd_set fds;
+ struct timeval tv;
+ int rc;
+
+ /* Nothing to do unless we're in timeout mode (not non-blocking) */
+ if (s->sock_timeout <= 0.0)
+ return 0;
+
+ /* Guard against closed socket */
+ if (s->sock_fd < 0)
+ return 0;
+
+ /* Construct the arguments to select */
+ tv.tv_sec = (int)s->sock_timeout;
+ tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
+ FD_ZERO(&fds);
+ FD_SET(s->sock_fd, &fds);
+
+ /* See if the socket is ready */
+ if (writing)
+ rc = select(s->sock_fd+1, NULL, &fds, NULL, &tv);
+ else
+ rc = select(s->sock_fd+1, &fds, NULL, NULL, &tv);
+
+ /* Return 1 on timeout, 0 otherwise */
+ return rc == 0;
+}
+
static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args)
{
char *data;
int len;
+ int timedout;
if (!PyArg_ParseTuple(args, "s#:write", &data, &len))
return NULL;
Py_BEGIN_ALLOW_THREADS
+ timedout = wait_for_timeout(self->Socket, 1);
+ Py_END_ALLOW_THREADS
+ if (timedout) {
+ PyErr_SetString(PySSLErrorObject, "The write operation timed out");
+ return NULL;
+ }
+ Py_BEGIN_ALLOW_THREADS
len = SSL_write(self->ssl, data, len);
Py_END_ALLOW_THREADS
if (len > 0)
@@ -330,6 +373,7 @@
PyObject *buf;
int count = 0;
int len = 1024;
+ int timedout;
if (!PyArg_ParseTuple(args, "|i:read", &len))
return NULL;
@@ -338,6 +382,13 @@
return NULL;
Py_BEGIN_ALLOW_THREADS
+ timedout = wait_for_timeout(self->Socket, 0);
+ Py_END_ALLOW_THREADS
+ if (timedout) {
+ PyErr_SetString(PySSLErrorObject, "The read operation timed out");
+ return NULL;
+ }
+ Py_BEGIN_ALLOW_THREADS
count = SSL_read(self->ssl, PyString_AsString(buf), len);
Py_END_ALLOW_THREADS
if (count <= 0) {