diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-06 11:09:01 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-11 20:32:11 +0200 |
| commit | c46e3f90bbc38080a41a278340aaad27d8881fd9 (patch) | |
| tree | 7ab8e5959e1fd2ef501799db3cfb84fb29641e93 /libmproxy/protocol2/auto.py | |
| parent | 531ca4a35684a83e57d4655922e9817814de41f6 (diff) | |
| download | mitmproxy-c46e3f90bbc38080a41a278340aaad27d8881fd9.tar.gz mitmproxy-c46e3f90bbc38080a41a278340aaad27d8881fd9.tar.bz2 mitmproxy-c46e3f90bbc38080a41a278340aaad27d8881fd9.zip | |
apply fixes from proxy-refactor-cb branch
Diffstat (limited to 'libmproxy/protocol2/auto.py')
| -rw-r--r-- | libmproxy/protocol2/auto.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmproxy/protocol2/auto.py b/libmproxy/protocol2/auto.py index a00f1f52..fc111758 100644 --- a/libmproxy/protocol2/auto.py +++ b/libmproxy/protocol2/auto.py @@ -1,4 +1,4 @@ -from __future__ import (absolute_import, print_function, division, unicode_literals) +from __future__ import (absolute_import, print_function, division) from .layer import Layer @@ -6,6 +6,8 @@ class AutoLayer(Layer): def __call__(self): d = self.client_conn.rfile.peek(1) + if not d: + return # TLS ClientHello magic, see http://www.moserware.com/2009/06/first-few-milliseconds-of-https.html#client-hello if d[0] == "\x16": layer = SslLayer(self, True, True) |