diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-28 17:44:55 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-28 17:44:55 +0100 |
| commit | 1b566869de4d07d509fa2ead6b91486326a9e5a4 (patch) | |
| tree | 8e776fec3323ab0db96a895ebc684606457209d6 /libpathod/pathoc.py | |
| parent | f83508d4bf313710de8afa204aaf9be227cf812c (diff) | |
| parent | ea894282f3a659cbb9466ce235c21f53f002ac3a (diff) | |
| download | mitmproxy-1b566869de4d07d509fa2ead6b91486326a9e5a4.tar.gz mitmproxy-1b566869de4d07d509fa2ead6b91486326a9e5a4.tar.bz2 mitmproxy-1b566869de4d07d509fa2ead6b91486326a9e5a4.zip | |
Merge branch 'master' into tcp_proxy
Diffstat (limited to 'libpathod/pathoc.py')
| -rw-r--r-- | libpathod/pathoc.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index c926f15f..0769b43c 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -1,5 +1,4 @@ import sys, os -import json from netlib import tcp, http import netlib.utils import language, utils @@ -45,7 +44,7 @@ class Pathoc(tcp.TCPClient): parsed = http.parse_response_line(l) if not parsed[1] == 200: raise PathocError("Proxy CONNECT failed: %s - %s"%(parsed[1], parsed[2])) - headers = http.read_headers(self.rfile) + http.read_headers(self.rfile) def connect(self, connect_to=None): """ @@ -69,7 +68,7 @@ class Pathoc(tcp.TCPClient): language.FileAccessDenied. """ r = language.parse_request(self.settings, spec) - ret = language.serve(r, self.wfile, self.settings, self.host) + language.serve(r, self.wfile, self.settings, self.host) self.wfile.flush() return Response(*http.read_response(self.rfile, r.method, None)) |