diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2015-05-31 13:49:21 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2015-05-31 13:49:21 +1200 |
commit | 50df036db5bd38a2639955674726a70cc643f32d (patch) | |
tree | 1d8c8b77ce82f3431784653ee75f38a5ba4dba27 | |
parent | 6c3233ce0cceede1d289b934f98751ce4285fae3 (diff) | |
parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
download | mitmproxy-50df036db5bd38a2639955674726a70cc643f32d.tar.gz mitmproxy-50df036db5bd38a2639955674726a70cc643f32d.tar.bz2 mitmproxy-50df036db5bd38a2639955674726a70cc643f32d.zip |
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
-rw-r--r-- | doc-src/features/passthrough.html | 10 | ||||
-rw-r--r-- | test/tools/ab.exe | bin | 0 -> 82944 bytes | |||
-rw-r--r-- | test/tools/benchtool.py (renamed from test/tools/yappibench.py) | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc-src/features/passthrough.html b/doc-src/features/passthrough.html index 7b377c82..17cc0259 100644 --- a/doc-src/features/passthrough.html +++ b/doc-src/features/passthrough.html @@ -51,10 +51,10 @@ $ mitmdump -v 127.0.0.1:50588: request -> CONNECT example.com:443 HTTP/1.1 127.0.0.1:50588: Set new server address: example.com:443 -<span style="color: white">127.0.0.1:50588: serverconnect - -> example.com:443</span> +127.0.0.1:50588: serverconnect + -> example.com:443 ^C -$ <span style="color: white">mitmproxy --ignore ^example\.com:443$</span> +$ mitmproxy --ignore ^example\.com:443$ </pre> Here are some other examples for ignore patterns: @@ -62,10 +62,10 @@ Here are some other examples for ignore patterns: # Exempt traffic from the iOS App Store (the regex is lax, but usually just works): --ignore apple.com:443 # "Correct" version without false-positives: ---ignore "^(.+\.)?apple\.com:443$" +--ignore '^(.+\.)?apple\.com:443$' # Ignore example.com, but not its subdomains: ---ignore "^example.com:" +--ignore '^example.com:' # Ignore everything but example.com and mitmproxy.org: --ignore '^(?!example\.com)(?!mitmproxy\.org)' diff --git a/test/tools/ab.exe b/test/tools/ab.exe Binary files differnew file mode 100644 index 00000000..d68ed0f3 --- /dev/null +++ b/test/tools/ab.exe diff --git a/test/tools/yappibench.py b/test/tools/benchtool.py index bae8da44..ae4636a7 100644 --- a/test/tools/yappibench.py +++ b/test/tools/benchtool.py @@ -26,7 +26,7 @@ class ApacheBenchThread(Thread): @click.command() -@click.option('--profiler', default="yappi", type=click.Choice(['yappi'])) +@click.option('--profiler', default="none", type=click.Choice(['none', 'yappi'])) @click.option('--clock-type', default="cpu", type=click.Choice(['wall', 'cpu'])) @click.option('--concurrency', default=1, type=click.INT) def main(profiler, clock_type, concurrency): |