diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2012-07-21 16:19:44 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2012-07-21 16:19:44 +1200 |
commit | 059a2329035b916c8762b58a385556266abb4629 (patch) | |
tree | fbb894da7e7458a9ce3bce12c9aa7ceac64356a1 /libpathod/pathoc.py | |
parent | 72e30d4712886ed06e8f8287ee7c6933e6e68d4b (diff) | |
download | mitmproxy-059a2329035b916c8762b58a385556266abb4629.tar.gz mitmproxy-059a2329035b916c8762b58a385556266abb4629.tar.bz2 mitmproxy-059a2329035b916c8762b58a385556266abb4629.zip |
Add support for client timeout to pathoc.
Diffstat (limited to 'libpathod/pathoc.py')
-rw-r--r-- | libpathod/pathoc.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index 3791c116..f79ed3af 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -45,7 +45,10 @@ class Pathoc(tcp.TCPClient): except http.HttpError, v: print >> fp, v.msg return - if verbose: - print_full(fp, *ret) + except tcp.NetLibTimeout: + print >> fp, "Timeout" else: - print_short(fp, *ret) + if verbose: + print_full(fp, *ret) + else: + print_short(fp, *ret) |