diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-18 18:07:38 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-18 18:07:38 +0200 |
| commit | 2d4a5fb116a175df0d464e9a501124a858731d99 (patch) | |
| tree | e4827d50f1833378bf7fd0b4cb370e37fceff2ed /libmproxy/protocol | |
| parent | 66d21fa4ba7bec0be0acc2c33baf8c6217bd2b38 (diff) | |
| download | mitmproxy-2d4a5fb116a175df0d464e9a501124a858731d99.tar.gz mitmproxy-2d4a5fb116a175df0d464e9a501124a858731d99.tar.bz2 mitmproxy-2d4a5fb116a175df0d464e9a501124a858731d99.zip | |
experimental: don't interfere with headers, fix #93
Diffstat (limited to 'libmproxy/protocol')
| -rw-r--r-- | libmproxy/protocol/__init__.py | 4 | ||||
| -rw-r--r-- | libmproxy/protocol/http_replay.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py index 35d59f28..0d624fd7 100644 --- a/libmproxy/protocol/__init__.py +++ b/libmproxy/protocol/__init__.py @@ -27,13 +27,13 @@ as late as possible; this makes server replay without any outgoing connections p from __future__ import (absolute_import, print_function, division) from .base import Layer, ServerConnectionMixin, Kill -from .http import Http1Layer, Http2Layer +from .http import Http1Layer, UpstreamConnectLayer, Http2Layer from .tls import TlsLayer, is_tls_record_magic from .rawtcp import RawTCPLayer __all__ = [ "Layer", "ServerConnectionMixin", "Kill", - "Http1Layer", "Http2Layer", + "Http1Layer", "UpstreamConnectLayer", "Http2Layer", "TlsLayer", "is_tls_record_magic", "RawTCPLayer" ] diff --git a/libmproxy/protocol/http_replay.py b/libmproxy/protocol/http_replay.py index 00b0b82b..14fbe547 100644 --- a/libmproxy/protocol/http_replay.py +++ b/libmproxy/protocol/http_replay.py @@ -1,5 +1,6 @@ from __future__ import (absolute_import, print_function, division) import threading +import traceback from libmproxy.exceptions import ReplayException from netlib.exceptions import HttpException, TcpException from netlib.http import http1 @@ -97,5 +98,8 @@ class RequestReplayThread(threading.Thread): # first place. from ..proxy.root_context import Log self.channel.tell("log", Log("Connection killed", "info")) + except Exception: + from ..proxy.root_context import Log + self.channel.tell("log", Log(traceback.format_exc(), "error")) finally: r.form_out = form_out_backup |