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

fix #4630

Browse Source
This commit is contained in:
Maximilian Hils 2021-06-09 23:59:44 +02:00
parent de0951462d
commit d47eb7556a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mitmproxy/addons/tlsconfig.py
View File

@ -172,7 +172,7 @@ class TlsConfig:
server.alpn_offers = tuple(client.alpn_offers) server.alpn_offers = tuple(client.alpn_offers)
else: else:
server.alpn_offers = tuple(x for x in client.alpn_offers if x != b"h2") server.alpn_offers = tuple(x for x in client.alpn_offers if x != b"h2")
elif client.tls_established: elif client.tls:
# We would perfectly support HTTP/1 -> HTTP/2, but we want to keep things on the same protocol version. # We would perfectly support HTTP/1 -> HTTP/2, but we want to keep things on the same protocol version.
# There are some edge cases where we want to mirror the regular server's behavior accurately, # There are some edge cases where we want to mirror the regular server's behavior accurately,
# for example header capitalization. # for example header capitalization.

3
test/helper_tools/loggrep.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import fileinput import fileinput
import sys import sys
import re
if __name__ == "__main__": if __name__ == "__main__":
if len(sys.argv) < 3: if len(sys.argv) < 3:
@ -10,7 +11,7 @@ if __name__ == "__main__":
port = sys.argv[1] port = sys.argv[1]
matches = False matches = False
for line in fileinput.input(sys.argv[2:]): for line in fileinput.input(sys.argv[2:]):
if line.startswith("["): if re.match(r"^\[|(\d+\.){3}", line):
matches = port in line matches = port in line
if matches: if matches:
print(line, end="") print(line, end="")