aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-07-14 17:26:22 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-07-14 17:26:22 +0200
commit71ba7089e23c107b7835b7122a05d829a326bdf5 (patch)
treecb78f8214569143289445e16b7854bc4f0cd7e1c /libmproxy/protocol
parentca7d398b42893dbe594d6d808c37221101a59217 (diff)
downloadmitmproxy-71ba7089e23c107b7835b7122a05d829a326bdf5.tar.gz
mitmproxy-71ba7089e23c107b7835b7122a05d829a326bdf5.tar.bz2
mitmproxy-71ba7089e23c107b7835b7122a05d829a326bdf5.zip
fix parameter naming
Diffstat (limited to 'libmproxy/protocol')
-rw-r--r--libmproxy/protocol/http.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index b7ff5b4b..8a321078 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -139,7 +139,7 @@ class HTTPMessage(stateobject.SimpleStateObject):
return c
@classmethod
- def from_stream(cls, rfile, include_content=True, body_size_limit=None):
+ def from_stream(cls, rfile, include_body=True, body_size_limit=None):
"""
Parse an HTTP message from a file stream
"""
@@ -248,7 +248,7 @@ class HTTPRequest(HTTPMessage):
return f
@classmethod
- def from_stream(cls, rfile, include_content=True, body_size_limit=None):
+ def from_stream(cls, rfile, include_body=True, body_size_limit=None):
"""
Parse an HTTP request from a file stream
"""
@@ -292,7 +292,7 @@ class HTTPRequest(HTTPMessage):
if headers is None:
raise http.HttpError(400, "Invalid headers")
- if include_content:
+ if include_body:
content = http.read_http_body(rfile, headers, body_size_limit, True)
timestamp_end = utils.timestamp()
@@ -605,7 +605,7 @@ class HTTPResponse(HTTPMessage):
return f
@classmethod
- def from_stream(cls, rfile, request_method, include_content=True, body_size_limit=None):
+ def from_stream(cls, rfile, request_method, include_body=True, body_size_limit=None):
"""
Parse an HTTP response from a file stream
"""
@@ -617,7 +617,7 @@ class HTTPResponse(HTTPMessage):
rfile,
request_method,
body_size_limit,
- include_body=include_content)
+ include_body=include_body)
if hasattr(rfile, "first_byte_timestamp"):
timestamp_start = rfile.first_byte_timestamp