Merge branch 'master' of https://github.com/xmendez/wfuzz

README.md

@@ -23,10 +23,13 @@ It was created to facilitate the task in web applications assessments, it's a to
 
 The tool is based on dictionaries or ranges, then you choose where you want to bruteforce just by replacing the value by the word FUZZ.
 
-Check the README file for usage examples.
+For further information check the wiki at https://github.com/xmendez/wfuzz/wiki.
+
+Or check the README file for usage examples.
+
 
 ## Download 
 
 Check github releases. Latest:
 
-- https://github.com/xmendez/wfuzz/releases/download/v2.1-beta/wfuzz-2.1.beta.tar.gz
+- https://github.com/xmendez/wfuzz/releases/latest

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")