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

use common interface for HTTP/1 and HTTP/2

Browse Source
This commit is contained in:
Thomas Kriechbaumer 2015-07-16 22:57:20 +02:00
parent 2b0465dbb9
commit 032f8b2985
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libpathod/pathoc.py
View File

@ -209,8 +209,7 @@ class Pathoc(tcp.TCPClient):
)
self.protocol = http2.HTTP2Protocol(self, dump_frames=self.http2_framedump)
else:
# TODO: create HTTP or Websockets protocol
self.protocol = None
self.protocol = http1.HTTP1Protocol(self)
self.settings = language.Settings(
is_client=True,
@ -409,16 +408,8 @@ class Pathoc(tcp.TCPClient):
req = language.serve(r, self.wfile, self.settings)
self.wfile.flush()
if self.use_http2:
status_code, headers, body = self.protocol.read_response()
resp = http.Response("HTTP/2", status_code, "", headers, body, self.sslinfo)
else:
resp = http.http1.read_response(
self.rfile,
req["method"],
None
)
resp.sslinfo = self.sslinfo
resp = self.protocol.read_response(req["method"], None)
resp.sslinfo = self.sslinfo
except http.HttpError as v:
lg("Invalid server response: %s" % v)
raise