aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2017-02-18 11:40:56 +0100
committerGitHub <noreply@github.com>2017-02-18 11:40:56 +0100
commit8cbd6dca9fe0f7822727f01fa0f405f25b03f471 (patch)
treea9c7c5cfdcb44860eeef4cef2c70f154671e617e
parent6a1e03ac6f5fbbfda70200d465cfb2f7cc01d253 (diff)
parentc04d14e53c9dee6cc36f840ee5d20deb09d8933b (diff)
downloadmitmproxy-8cbd6dca9fe0f7822727f01fa0f405f25b03f471.tar.gz
mitmproxy-8cbd6dca9fe0f7822727f01fa0f405f25b03f471.tar.bz2
mitmproxy-8cbd6dca9fe0f7822727f01fa0f405f25b03f471.zip
Merge pull request #2035 from Kriechi/fix-1916
fix #1916
-rw-r--r--mitmproxy/net/http/http1/read.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/net/http/http1/read.py b/mitmproxy/net/http/http1/read.py
index d0493da4..ef88fd6c 100644
--- a/mitmproxy/net/http/http1/read.py
+++ b/mitmproxy/net/http/http1/read.py
@@ -227,7 +227,7 @@ def _get_first_line(rfile):
if line == b"\r\n" or line == b"\n":
# Possible leftover from previous message
line = rfile.readline()
- except exceptions.TcpDisconnect:
+ except (exceptions.TcpDisconnect, exceptions.TlsException):
raise exceptions.HttpReadDisconnect("Remote disconnected")
if not line:
raise exceptions.HttpReadDisconnect("Remote disconnected")