diff options
author | mkaay <mkaay@mkaay.de> | 2011-01-31 22:54:39 +0100 |
---|---|---|
committer | mkaay <mkaay@mkaay.de> | 2011-01-31 22:54:39 +0100 |
commit | 8ebc6f8a59ce86c9f67e594f59d8db621a6cc8d0 (patch) | |
tree | bfb68abc110ae4d3f26be4da41c85c381e93c505 | |
parent | added captchatrader.com support, fixed lof.cc (diff) | |
download | pyload-8ebc6f8a59ce86c9f67e594f59d8db621a6cc8d0.tar.xz |
proxy fix
-rw-r--r-- | module/network/HTTPRequest.py | 5 | ||||
-rw-r--r-- | module/plugins/Plugin.py | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/module/network/HTTPRequest.py b/module/network/HTTPRequest.py index 67d1e0f19..25563cd72 100644 --- a/module/network/HTTPRequest.py +++ b/module/network/HTTPRequest.py @@ -90,7 +90,8 @@ class HTTPRequest(): else: self.c.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_HTTP) - self.c.setopt(pycurl.PROXY, "%s:%s" % (proxy["address"], proxy["port"])) + self.c.setopt(pycurl.PROXY, proxy["address"]) + self.c.setopt(pycurl.PROXYPORT, proxy["port"]) if proxy["username"]: self.c.setopt(pycurl.PROXYUSERPWD, "%s:%s" % (proxy["username"], proxy["password"])) @@ -204,4 +205,4 @@ if __name__ == "__main__": url = "http://pyload.org" c = HTTPRequest() print c.load(url) -
\ No newline at end of file + diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 3630e5222..8af61c5fc 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -280,6 +280,7 @@ class Plugin(object): else: self.ctresult = result task.setResult(result.getResult()) + self.log.debug("CaptchaTrader response: %s" % result.getResult()) task.setDone() start_new_thread(threaded, (ct, )) |