Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

use netlib.http_semantics for generic data

Browse Source
This commit is contained in:
Thomas Kriechbaumer 2015-07-08 21:03:04 +02:00
parent c3c3d28bb1
commit df1b0df39f
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmproxy/protocol/http.py
View File

@ -760,7 +760,7 @@ class HTTPResponse(HTTPMessage):
if hasattr(rfile, "reset_timestamps"):
rfile.reset_timestamps()
httpversion, code, msg, headers, content = http.read_response(
resp = http.read_response(
rfile,
request_method,
body_size_limit,
@ -776,11 +776,11 @@ class HTTPResponse(HTTPMessage):
timestamp_end = None
return HTTPResponse(
httpversion,
code,
msg,
headers,
content,
resp.httpversion,
resp.status_code,
resp.msg,
resp.headers,
resp.content,
timestamp_start,
timestamp_end
)

14
test/test_server.py
View File

@ -765,22 +765,16 @@ class TestStreamRequest(tservers.HTTPProxTest):
(self.server.urlbase, spec))
connection.send("\r\n")
httpversion, code, msg, headers, content = http.read_response(
fconn, "GET", None, include_body=False)
resp = http.read_response(fconn, "GET", None, include_body=False)
assert headers["Transfer-Encoding"][0] == 'chunked'
assert code == 200
assert resp.headers["Transfer-Encoding"][0] == 'chunked'
assert resp.status_code == 200
chunks = list(
content for _,
content,
_ in http.read_http_body_chunked(
fconn,
headers,
None,
"GET",
200,
False))
fconn, resp.headers, None, "GET", 200, False))
assert chunks == ["this", "isatest", ""]
connection.close()