aboutsummaryrefslogtreecommitdiffstats
path: root/pathod
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-10-01 12:01:02 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-10-01 12:01:02 +1300
commit915bcfbd305d7b18de07f4f40dab1e49a06b132c (patch)
tree1b2e0226e9ad9e3a5ac97d643886faa80740b113 /pathod
parent8bb81be2b07b4b93a8ec7c088bf1ff4728fcec21 (diff)
downloadmitmproxy-915bcfbd305d7b18de07f4f40dab1e49a06b132c.tar.gz
mitmproxy-915bcfbd305d7b18de07f4f40dab1e49a06b132c.tar.bz2
mitmproxy-915bcfbd305d7b18de07f4f40dab1e49a06b132c.zip
Add timeout argument to Pathod, and matching -t command-line option.
Diffstat (limited to 'pathod')
-rwxr-xr-xpathod7
1 files changed, 6 insertions, 1 deletions
diff --git a/pathod b/pathod
index 82a7edc0..91cd13e3 100755
--- a/pathod
+++ b/pathod
@@ -88,7 +88,8 @@ def main(parser, args):
noweb = args.noweb,
nocraft = args.nocraft,
noapi = args.noapi,
- nohang = args.nohang
+ nohang = args.nohang,
+ timeout = args.timeout
)
except pathod.PathodError, v:
parser.error(str(v))
@@ -135,6 +136,10 @@ if __name__ == "__main__":
help='Serve with SSL.'
)
parser.add_argument(
+ "-t", dest="timeout", type=int, default=None,
+ help="Connection timeout"
+ )
+ parser.add_argument(
"--limit-size", dest='sizelimit', default=None, type=str,
help='Size limit of served responses. Understands size suffixes, i.e. 100k.'
)