diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-07-19 18:17:09 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-07-22 15:30:34 +0200 |
| commit | 11ac387df2a49d132a08648b6cb5121224924c9d (patch) | |
| tree | a4d141d638211fa4f98d12edc7f07680b3f394a6 /libpathod | |
| parent | 6d5a3da9294d5bc6758ded173729042573c9fe5f (diff) | |
| download | mitmproxy-11ac387df2a49d132a08648b6cb5121224924c9d.tar.gz mitmproxy-11ac387df2a49d132a08648b6cb5121224924c9d.tar.bz2 mitmproxy-11ac387df2a49d132a08648b6cb5121224924c9d.zip | |
rename content -> body
Diffstat (limited to 'libpathod')
| -rw-r--r-- | libpathod/pathoc.py | 2 | ||||
| -rw-r--r-- | libpathod/pathod.py | 2 | ||||
| -rw-r--r-- | libpathod/protocols/http.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index c1bca07f..e93e6208 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -417,7 +417,7 @@ class Pathoc(tcp.TCPClient): finally: if resp: lg("<< %s %s: %s bytes" % ( - resp.status_code, utils.xrepr(resp.msg), len(resp.content) + resp.status_code, utils.xrepr(resp.msg), len(resp.body) )) if resp.status_code in self.ignorecodes: lg.suppress() diff --git a/libpathod/pathod.py b/libpathod/pathod.py index f8607cca..6f25d0c8 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -212,7 +212,7 @@ class PathodHandler(tcp.BaseHandler): spec = anchor_gen.next() if self.use_http2 and isinstance(spec, language.http2.Response): - spec.stream_id = stream_id + spec.stream_id = req.stream_id lg("crafting spec: %s" % spec) nexthandler, retlog["response"] = self.http_serve_crafted( diff --git a/libpathod/protocols/http.py b/libpathod/protocols/http.py index 43ef0799..d6017882 100644 --- a/libpathod/protocols/http.py +++ b/libpathod/protocols/http.py @@ -13,7 +13,7 @@ class HTTPProtocol: def make_error_response(self, reason, body): return language.http.make_error_response(reason, body) - def handle_http_app(self, method, path, headers, content, lg): + def handle_http_app(self, method, path, headers, body, lg): """ Handle a request to the built-in app. """ @@ -25,7 +25,7 @@ class HTTPProtocol: msg="Access denied: web interface disabled" ) lg("app: %s %s" % (method, path)) - req = wsgi.Request("http", method, path, headers, content) + req = wsgi.Request("http", method, path, headers, body) flow = wsgi.Flow(self.pathod_handler.address, req) sn = self.pathod_handler.connection.getsockname() a = wsgi.WSGIAdaptor( |