Merge pull request xmendez#3 from liorbp/patch-1

Fixed a typo that prevents using SOCKS 4/5 proxy for a particular request. Althought, this is done now in myhttp.py, so this code should not be currently used.
auooo · Jan 22, 2015 · 567ff8b · 567ff8b
2 parents 2c7caa7 + 1411ddc
commit 567ff8b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/externals/reqresp/Request.py b/externals/reqresp/Request.py
@@ -306,9 +306,9 @@ def to_pycurl_object(c, req):
 	    proxy = req.getProxy()
 	    if proxy != None:
 		    c.setopt(pycurl.PROXY, proxy)
-		    if req.proxytype=="SOCK5":
+		    if req.proxytype=="SOCKS5":
 			    c.setopt(pycurl.PROXYTYPE,pycurl.PROXYTYPE_SOCKS5)
-		    elif req.proxytype=="SOCK4":
+		    elif req.proxytype=="SOCKS4":
 			    c.setopt(pycurl.PROXYTYPE,pycurl.PROXYTYPE_SOCKS4)
 		    req.delHeader("Proxy-Connection")