aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-07-12 15:54:00 +0200
committerGitHub <noreply@github.com>2016-07-12 15:54:00 +0200
commit4fd71d7bfdb3d0568262be807eed1268441df9e9 (patch)
tree7af7a45731c56a6cb0b2aae86887114b728ba201
parent427ba886182563a83f71dc966b139e504f25ad39 (diff)
parent62176142043efb814608c61edf1e18f91eb7a13f (diff)
downloadmitmproxy-4fd71d7bfdb3d0568262be807eed1268441df9e9.tar.gz
mitmproxy-4fd71d7bfdb3d0568262be807eed1268441df9e9.tar.bz2
mitmproxy-4fd71d7bfdb3d0568262be807eed1268441df9e9.zip
Merge pull request #1344 from strohu/patch-1
Fix is_ascii check when determining next layer
-rw-r--r--mitmproxy/proxy/root_context.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/proxy/root_context.py b/mitmproxy/proxy/root_context.py
index 57183c7e..4d6509d4 100644
--- a/mitmproxy/proxy/root_context.py
+++ b/mitmproxy/proxy/root_context.py
@@ -100,7 +100,7 @@ class RootContext(object):
is_ascii = (
len(d) == 3 and
# expect A-Za-z
- all(65 <= x <= 90 and 97 <= x <= 122 for x in six.iterbytes(d))
+ all(65 <= x <= 90 or 97 <= x <= 122 for x in six.iterbytes(d))
)
if self.config.rawtcp and not is_ascii:
return protocol.RawTCPLayer(top_layer)