From 915c206e3dc33961857f2338ac2186dd211c21b0 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 24 May 2011 09:47:10 +0000
Subject: [PATCH] minor fix for socks proxy issues

---
 lib/request/connect.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/request/connect.py b/lib/request/connect.py
index f0cfcb0f9..8724cb2fd 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -17,6 +17,7 @@ import urlparse
 import traceback
 
 from extra.multipart import multipartpost
+from extra.socks.socks import GeneralProxyError
 from lib.core.agent import agent
 from lib.core.common import average
 from lib.core.common import calculateDeltaSeconds
@@ -361,7 +362,7 @@ class Connect:
                 page = processResponse(page, responseHeaders)
                 return page, responseHeaders
 
-        except (urllib2.URLError, socket.error, socket.timeout, httplib.BadStatusLine, httplib.IncompleteRead), e:
+        except (urllib2.URLError, socket.error, socket.timeout, httplib.BadStatusLine, httplib.IncompleteRead, GeneralProxyError), e:
             tbMsg = traceback.format_exc()
 
             if "no host given" in tbMsg: