Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix other occurences of options shortcut | Maximilian Hils | 2017-03-07 | 8 | -10/+10 |
| | |||||
* | Update tcpproxy.rst | Yamamori Akihiro | 2017-03-07 | 1 | -1/+1 |
| | | | Correction in key short cut for TCP Proxy | ||||
* | Merge pull request #2101 from s4chin/add-websocket-filter-to-web | Maximilian Hils | 2017-03-06 | 2 | -84/+111 |
|\ | | | | | web: Add websocket filter | ||||
| * | web: Add websocket filter | Sachin Kelkar | 2017-03-06 | 2 | -84/+111 |
| | | |||||
* | | Merge pull request #2104 from lymanZerga11/patch-2 | Maximilian Hils | 2017-03-06 | 1 | -1/+1 |
|\ \ | | | | | | | Fixes #2102 | ||||
| * | | Update flowlist.py | lymanZerga11 | 2017-03-06 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #2105 from Kriechi/dev-version | Maximilian Hils | 2017-03-06 | 1 | -1/+1 |
|\ \ | |/ |/| | clearly indentify git-checkout as dev version | ||||
| * | clearly indentify git-checkout as dev version | Thomas Kriechbaumer | 2017-03-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2085 from MatthewShao/dev | Maximilian Hils | 2017-03-05 | 3 | -2/+15 |
|\ \ | | | | | | | [web] Add mouse support for FilterInput popover. | ||||
| * | | [web] Retain focus on input field after selecting. (#2085) | Matthew Shao | 2017-03-04 | 1 | -0/+1 |
| | | | |||||
| * | | [web] Simplify the code. (#2085) | Matthew Shao | 2017-03-03 | 1 | -6/+2 |
| | | | |||||
| * | | [web] Add mouse support for FilterInput popover. | Matthew Shao | 2017-03-02 | 3 | -3/+19 |
| |/ | |||||
* | | Merge pull request #2095 from MatthewShao/fix-#2083 | Clemens Brunner | 2017-03-04 | 1 | -2/+1 |
|\ \ | | | | | | | [web] fix scroll bug in flow detail. (#2083) | ||||
| * | | [web] fix scroll bug in flow detail. (#2083) | Matthew Shao | 2017-03-04 | 1 | -2/+1 |
| | | | |||||
* | | | Merge pull request #2082 from tarnacious/master | Maximilian Hils | 2017-03-04 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Call error handler and mark flow on HTTPException | ||||
| * | | Call error handler and mark flow on HTTPException | tarnacious | 2017-03-01 | 1 | -0/+2 |
| |/ | | | | | | | | | This allows scripts to handle HTTPExceptions such as "HTTP Body too large" raised in mitmproxy/net/http/http1/read.py:131 | ||||
* | | update release docs | Maximilian Hils | 2017-03-04 | 5 | -16718/+18855 |
| | | |||||
* | | Merge pull request #2081 from s4chin/add-pretty-host | Maximilian Hils | 2017-03-04 | 2 | -5/+2 |
|\ \ | | | | | | | web: Fix #1888 | ||||
| * | | web: Fix #1888 | Sachin Kelkar | 2017-03-03 | 2 | -5/+2 |
| | | | |||||
* | | | Merge pull request #2053 from krsoninikhil/on-issues | Maximilian Hils | 2017-03-04 | 7 | -13/+35 |
|\ \ \ | | | | | | | | | Adds --keep-host-header option (#2039) | ||||
| * | | | update docs wording | Maximilian Hils | 2017-03-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into on-issues | Nikhil Soni | 2017-03-03 | 56 | -680/+1674 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | docs: fix cert install link | Maximilian Hils | 2017-03-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | docs: http -> https where possible | Maximilian Hils | 2017-03-02 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #2087 from TomTasche/patch-1 | Maximilian Hils | 2017-03-02 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | link to stackoverflow for chrome certificate management | ||||
| * | | | link to stackoverflow for chrome certificate management | Thomas Taschauer | 2017-03-02 | 1 | -1/+1 |
|/ / / | |||||
* | / | http2: fix h2 header normalization test (#2080) | Thomas Kriechbaumer | 2017-03-01 | 2 | -72/+0 |
| |/ |/| | |||||
* | | added XSS scanner example (#1907) | David Dworken | 2017-02-27 | 2 | -0/+775 |
| | | |||||
* | | Merge pull request #2072 from MatthewShao/dev | Thomas Kriechbaumer | 2017-02-27 | 1 | -0/+1 |
|\ \ | | | | | | | [web] Fix #2071, remove client_connect.mitmcert when dumping flow into json. | ||||
| * | | Fix #2071, remove client_connect.mitmcert when dumping flow into json. | Matthew Shao | 2017-02-27 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #2069 from JordanLoehr/iss2068 | Maximilian Hils | 2017-02-27 | 1 | -2/+2 |
|\ \ | | | | | | | Added console_ prefix to options in palettepicker to resolve issue #2068 | ||||
| * | | Added console_ prefix to options in palettepicket to resolve issue #2068 | Jordan Loehr | 2017-02-26 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2067 from whackashoe/fix-2065 | Maximilian Hils | 2017-02-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix #2065 by setting correct content encoding for brotli | ||||
| * | | | fix #2065 by setting correct content encoding for brotli | Jett | 2017-02-26 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2066 from Kriechi/certs-tests | Thomas Kriechbaumer | 2017-02-26 | 4 | -17/+39 |
|\ \ \ | | | | | | | | | certs: coverage++ | ||||
| * | | | do not return IP addresses in SSLCert.altnames | Thomas Kriechbaumer | 2017-02-26 | 2 | -2/+3 |
| | | | | |||||
| * | | | certs: coverage++ | Thomas Kriechbaumer | 2017-02-26 | 4 | -17/+38 |
|/ / / | |||||
* | | | connections: coverage++ (#2064) | Thomas Kriechbaumer | 2017-02-26 | 5 | -41/+211 |
| | | | |||||
* | | | Merge pull request #2063 from ujjwal96/hardump-support | Maximilian Hils | 2017-02-26 | 2 | -8/+3 |
|\ \ \ | |/ / |/| | | Remove pytz in hardump | ||||
| * | | Remove pytz in hardump | Ujjwal Verma | 2017-02-25 | 2 | -8/+3 |
|/ / | |||||
* | | optmanager: coverage++ (#2062) | Thomas Kriechbaumer | 2017-02-25 | 2 | -9/+15 |
| | | |||||
* | | http: coverage++ (#2060) | Thomas Kriechbaumer | 2017-02-24 | 2 | -2/+25 |
| | | |||||
* | | move tests around (#2059) | Thomas Kriechbaumer | 2017-02-24 | 2 | -225/+232 |
| | | |||||
* | | move tests around (#2058) | Thomas Kriechbaumer | 2017-02-24 | 3 | -67/+68 |
| | | |||||
* | | Merge pull request #2057 from Kriechi/flowfilter-coverage | Thomas Kriechbaumer | 2017-02-24 | 6 | -4/+105 |
|\ \ | | | | | | | flowfilter: coverage++ | ||||
| * | | flowfilter: coverage++ | Thomas Kriechbaumer | 2017-02-24 | 6 | -4/+105 |
|/ / | |||||
* | | Merge pull request #2050 from Kriechi/create_connection | Thomas Kriechbaumer | 2017-02-24 | 38 | -254/+210 |
|\ \ | | | | | | | nuke tcp.Address and add proper IPv6 support | ||||
| * | | fix constant definition | Maximilian Hils | 2017-02-24 | 1 | -4/+3 |
| | | | |||||
| * | | nuke tcp.Address and add proper IPv6 support | Thomas Kriechbaumer | 2017-02-24 | 38 | -254/+211 |
|/ / | |||||
* | | Merge pull request #2055 from Kriechi/http2-normalize-headers | Thomas Kriechbaumer | 2017-02-23 | 1 | -2/+0 |
|\ \ | | | | | | | http2: normalize headers before sending |