diff options
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/common.py | 4 | ||||
| -rw-r--r-- | libmproxy/console/help.py | 1 | ||||
| -rw-r--r-- | libmproxy/protocol/http.py | 11 |
3 files changed, 10 insertions, 6 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index 48cb0f87..1a72fa2a 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -96,6 +96,10 @@ def format_keyvals(lst, key="key", val="text", indent=0): def shortcuts(k): if k == " ": k = "page down" + elif k == "ctrl f": + k = "page down" + elif k == "ctrl b": + k = "page up" elif k == "j": k = "down" elif k == "k": diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py index ba87348d..74748030 100644 --- a/libmproxy/console/help.py +++ b/libmproxy/console/help.py @@ -31,6 +31,7 @@ class HelpView(urwid.ListBox): ("g, G", "go to beginning, end"), ("space", "page down"), ("pg up/down", "page up/down"), + ("ctrl+b/ctrl+f", "page up/down"), ("arrows", "up, down, left, right"), ] text.extend( diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 8e56c699..8740927e 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -1,12 +1,11 @@ from __future__ import (absolute_import, print_function, division) -import itertools import sys import traceback import six from netlib import tcp -from netlib.exceptions import HttpException, HttpReadDisconnect, TcpException +from netlib.exceptions import HttpException, HttpReadDisconnect, NetlibException from netlib.http import http1, Headers from netlib.http import CONTENT_MISSING from netlib.tcp import Address @@ -319,7 +318,7 @@ class HttpLayer(Layer): except HttpReadDisconnect: # don't throw an error for disconnects that happen before/between requests. return - except (HttpException, TcpException) as e: + except NetlibException as e: self.send_error_response(400, repr(e)) six.reraise(ProtocolException, ProtocolException("Error in HTTP connection: %s" % repr(e)), sys.exc_info()[2]) @@ -366,7 +365,7 @@ class HttpLayer(Layer): self.handle_upstream_mode_connect(flow.request.copy()) return - except (HttpException, TcpException) as e: + except NetlibException as e: self.send_error_response(502, repr(e)) if not flow.response: @@ -392,7 +391,7 @@ class HttpLayer(Layer): try: response = make_error_response(code, message) self.send_response(response) - except TcpException: + except NetlibException: pass def change_upstream_proxy_server(self, address): @@ -440,7 +439,7 @@ class HttpLayer(Layer): try: get_response() - except (TcpException, HttpException) as v: + except NetlibException as v: self.log( "server communication error: %s" % repr(v), level="debug" |