kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-01-12 22:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

py3: fix bytes vs. str

Browse Source
This commit is contained in:
Thomas Kriechbaumer
2016-07-03 19:04:16 +02:00
parent 45aa2174e2
commit 23e295b37e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netlib/http/http2/utils.py
View File

@@ -2,10 +2,10 @@ from netlib.http import url
def parse_headers(headers):
authority = headers.get(':authority', b'')
method = headers.get(':method', b'GET')
scheme = headers.get(':scheme', b'https')
path = headers.get(':path', b'/')
authority = headers.get(':authority', '').encode()
method = headers.get(':method', 'GET').encode()
scheme = headers.get(':scheme', 'https').encode()
path = headers.get(':path', '/').encode()
headers.clear(":method")
headers.clear(":scheme")

10
pathod/protocols/http2.py
View File

@@ -181,10 +181,10 @@ class HTTP2StateProtocol(object):
headers = request.headers.copy()
if ':authority' not in headers:
headers.insert(0, b':authority', authority.encode('ascii'))
headers.insert(0, b':scheme', request.scheme.encode('ascii'))
headers.insert(0, b':path', request.path.encode('ascii'))
headers.insert(0, b':method', request.method.encode('ascii'))
headers.insert(0, ':authority', authority)
headers.insert(0, ':scheme', request.scheme)
headers.insert(0, ':path', request.path)
headers.insert(0, ':method', request.method)
if hasattr(request, 'stream_id'):
stream_id = request.stream_id
@@ -397,7 +397,7 @@ class HTTP2StateProtocol(object):
self._handle_unexpected_frame(frm)
headers = netlib.http.headers.Headers(
(k.encode('ascii'), v.encode('ascii')) for k, v in self.decoder.decode(header_blocks)
[[k, v] for k, v in self.decoder.decode(header_blocks, raw=True)]
)
return stream_id, headers, body