Fixes issue 131. Handle socket.timeout's that occur during send.

3 files changed, 5 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index a934692..0a010be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 tests:
 	cd python2 && python2.4 httplib2test.py
-	cd python2 && python2.5 httplib2test.py
+	-cd python2 && python2.5 httplib2test.py
 	cd python2 && python2.6 httplib2test.py
 	cd python3 && python3.1 httplib2test.py
 
diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
index 2b4848f..c87010c 100644
--- a/python2/httplib2/__init__.py
+++ b/python2/httplib2/__init__.py
@@ -867,6 +867,8 @@ the same interface as FileCache."""
         for i in range(2):
             try:
                 conn.request(method, request_uri, body, headers)
+            except socket.timeout:
+                raise
             except socket.gaierror:
                 conn.close()
                 raise ServerNotFoundError("Unable to find the server at %s" % conn.host)
diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
index b25b9c8..07e05b4 100644
--- a/python3/httplib2/__init__.py
+++ b/python3/httplib2/__init__.py
@@ -848,6 +848,8 @@ the same interface as FileCache."""
         for i in range(2):
             try:
                 conn.request(method, request_uri, body, headers)
+            except socket.timeout:
+                raise
             except socket.gaierror:
                 conn.close()
                 raise ServerNotFoundError("Unable to find the server at %s" % conn.host)