From dcc062fcb9c3eeac045471919b017e70a258e217 Mon Sep 17 00:00:00 2001 From: Joe Gregorio Date: Mon, 13 Jun 2011 13:09:20 -0400 Subject: Fixes issue 145. --- python2/httplib2/__init__.py | 2 ++ python3/httplib2/__init__.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py index fb090a9..39d817f 100644 --- a/python2/httplib2/__init__.py +++ b/python2/httplib2/__init__.py @@ -911,6 +911,8 @@ class HTTPSConnectionWithTimeout(httplib.HTTPSConnection): raise SSLHandshakeError(e) else: raise + except (socket.timeout, socket.gaierror): + raise except socket.error, msg: if self.debuglevel > 0: print 'connect fail:', (self.host, self.port) diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py index a53723b..c5ab677 100644 --- a/python3/httplib2/__init__.py +++ b/python3/httplib2/__init__.py @@ -895,6 +895,8 @@ the same interface as FileCache.""" pass try: response = conn.getresponse() + except socket.timeout: + raise except (socket.error, http.client.HTTPException): conn.close() if i == 0: -- cgit v1.2.1