[Python-checkins] r43492 - in python/branches/release24-maint: Lib/test/test_socket_ssl.py Misc/NEWS Modules/_ssl.c

Fri Mar 31 20:01:26 CEST 2006

Author: georg.brandl
Date: Fri Mar 31 20:01:24 2006
New Revision: 43492
Modified:
 python/branches/release24-maint/Lib/test/test_socket_ssl.py
 python/branches/release24-maint/Misc/NEWS
 python/branches/release24-maint/Modules/_ssl.c
Log:
Patch #1380952: fix SSL objects timing out on consecutive read()s
 (backport from rev. 43491)
Modified: python/branches/release24-maint/Lib/test/test_socket_ssl.py
==============================================================================

--- python/branches/release24-maint/Lib/test/test_socket_ssl.py	(original)
+++ python/branches/release24-maint/Lib/test/test_socket_ssl.py	Fri Mar 31 20:01:24 2006
@@ -27,6 +27,19 @@
 buf = f.read()
 f.close()
 
+def test_timeout():
+ test_support.requires('network')
+
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ s.settimeout(30.0)
+ # connect to service which issues an welcome banner (without need to write anything)
+ s.connect(("gmail.org", 995))
+ ss = socket.ssl(s)
+ # read part of return welcome banner twice,# read part of return welcome banner twice
+ ss.read(1)
+ ss.read(1)
+ s.close()
+					 
 def test_rude_shutdown():
 try:
 import thread
@@ -63,6 +76,7 @@
 raise test_support.TestSkipped("socket module has no ssl support")
 test_rude_shutdown()
 test_basic()
+ test_timeout()
 
 if __name__ == "__main__":
 test_main()
Modified: python/branches/release24-maint/Misc/NEWS
==============================================================================
--- python/branches/release24-maint/Misc/NEWS	(original)
+++ python/branches/release24-maint/Misc/NEWS	Fri Mar 31 20:01:24 2006
@@ -25,6 +25,8 @@
 Extension Modules
 -----------------
 
+- Patch #1380952: fix SSL objects timing out on consecutive read()s
+
 - Ubuntu bug #29289: Fixed a bug that the gb18030 codec raises
 RuntimeError on encoding surrogate pair area on UCS4 build.
 
Modified: python/branches/release24-maint/Modules/_ssl.c
==============================================================================
--- python/branches/release24-maint/Modules/_ssl.c	(original)
+++ python/branches/release24-maint/Modules/_ssl.c	Fri Mar 31 20:01:24 2006
@@ -474,15 +474,22 @@
 
 	if (!(buf = PyString_FromStringAndSize((char *) 0, len)))
 		return NULL;
-
-	sockstate = check_socket_and_wait_for_timeout(self->Socket, 0);
-	if (sockstate == SOCKET_HAS_TIMED_OUT) {
-		PyErr_SetString(PySSLErrorObject, "The read operation timed out");
-		Py_DECREF(buf);
-		return NULL;
-	} else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
-		PyErr_SetString(PySSLErrorObject, "Underlying socket too large for select().");
-		return NULL;
+	
+	/* first check if there are bytes ready to be read */
+	Py_BEGIN_ALLOW_THREADS
+	count = SSL_pending(self->ssl);
+	Py_END_ALLOW_THREADS
+
+	if (!count) {
+		sockstate = check_socket_and_wait_for_timeout(self->Socket, 0);
+		if (sockstate == SOCKET_HAS_TIMED_OUT) {
+			PyErr_SetString(PySSLErrorObject, "The read operation timed out");
+			Py_DECREF(buf);
+			return NULL;
+		} else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
+			PyErr_SetString(PySSLErrorObject, "Underlying socket too large for select().");
+			return NULL;
+		}
 	}
 	do {
 		err = 0;
