diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-09-04 14:18:07 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-04 14:18:07 +0200 |
| commit | 1135666ee6fb145491eb6d07435eb0cf58b2094f (patch) | |
| tree | 843fbfe8c708d8b260ea74fe7d98b3bad4bd1c6f | |
| parent | 649e63ff3c868397f493e1dabdc1c63d572aedd8 (diff) | |
| parent | 39fa579dd564823171f804c4307ab93db4d3b961 (diff) | |
| download | mitmproxy-1135666ee6fb145491eb6d07435eb0cf58b2094f.tar.gz mitmproxy-1135666ee6fb145491eb6d07435eb0cf58b2094f.tar.bz2 mitmproxy-1135666ee6fb145491eb6d07435eb0cf58b2094f.zip | |
Merge branch 'master' into issue_341
| -rw-r--r-- | libmproxy/console/__init__.py | 2 | ||||
| -rw-r--r-- | libmproxy/protocol/http.py | 5 | ||||
| -rw-r--r-- | test/test_server.py | 7 |
3 files changed, 5 insertions, 9 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index a5920915..ca395ed9 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -599,6 +599,8 @@ class ConsoleMaster(flow.FlowMaster): try: self.ui.run_wrapper(self.loop) except Exception: + self.ui.stop() + sys.stdout.flush() print >> sys.stderr, traceback.format_exc() print >> sys.stderr, "mitmproxy has crashed!" print >> sys.stderr, "Please lodge a bug report at: https://github.com/mitmproxy/mitmproxy" diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 3f9eecb3..9699c78a 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -635,11 +635,12 @@ class HTTPResponse(HTTPMessage): return f def __repr__(self): + size = utils.pretty_size(len(self.content)) if self.content else "content missing" return "<HTTPResponse: {code} {msg} ({contenttype}, {size})>".format( code=self.code, msg=self.msg, - contenttype=self.headers.get_first("content-type", "?"), - size=utils.pretty_size(len(self.content)) + contenttype=self.headers.get_first("content-type", "unknown content type"), + size=size ) @classmethod diff --git a/test/test_server.py b/test/test_server.py index 48527547..6c0829f4 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -108,13 +108,6 @@ class TestHTTP(tservers.HTTPProxTest, CommonMixin, AppMixin): assert p.request(req) assert p.request(req) - def test_proxy_ioerror(self): - # Tests a difficult-to-trigger condition, where an IOError is raised - # within our read loop. - with mock.patch("libmproxy.protocol.http.HTTPRequest.from_stream") as m: - m.side_effect = IOError("error!") - tutils.raises("server disconnect", self.pathod, "304") - def test_get_connection_switching(self): def switched(l): for i in l: |