aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix other occurences of options shortcutMaximilian Hils2017-03-078-10/+10
|
* Update tcpproxy.rstYamamori Akihiro2017-03-071-1/+1
| | | Correction in key short cut for TCP Proxy
* Merge pull request #2101 from s4chin/add-websocket-filter-to-webMaximilian Hils2017-03-062-84/+111
|\ | | | | web: Add websocket filter
| * web: Add websocket filterSachin Kelkar2017-03-062-84/+111
| |
* | Merge pull request #2104 from lymanZerga11/patch-2Maximilian Hils2017-03-061-1/+1
|\ \ | | | | | | Fixes #2102
| * | Update flowlist.pylymanZerga112017-03-061-1/+1
| |/
* | Merge pull request #2105 from Kriechi/dev-versionMaximilian Hils2017-03-061-1/+1
|\ \ | |/ |/| clearly indentify git-checkout as dev version
| * clearly indentify git-checkout as dev versionThomas Kriechbaumer2017-03-061-1/+1
| |
* | Merge pull request #2085 from MatthewShao/devMaximilian Hils2017-03-053-2/+15
|\ \ | | | | | | [web] Add mouse support for FilterInput popover.
| * | [web] Retain focus on input field after selecting. (#2085)Matthew Shao2017-03-041-0/+1
| | |
| * | [web] Simplify the code. (#2085)Matthew Shao2017-03-031-6/+2
| | |
| * | [web] Add mouse support for FilterInput popover.Matthew Shao2017-03-023-3/+19
| |/
* | Merge pull request #2095 from MatthewShao/fix-#2083Clemens Brunner2017-03-041-2/+1
|\ \ | | | | | | [web] fix scroll bug in flow detail. (#2083)
| * | [web] fix scroll bug in flow detail. (#2083)Matthew Shao2017-03-041-2/+1
| | |
* | | Merge pull request #2082 from tarnacious/masterMaximilian Hils2017-03-041-0/+2
|\ \ \ | |/ / |/| | Call error handler and mark flow on HTTPException
| * | Call error handler and mark flow on HTTPExceptiontarnacious2017-03-011-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 docsMaximilian Hils2017-03-045-16718/+18855
| |
* | Merge pull request #2081 from s4chin/add-pretty-hostMaximilian Hils2017-03-042-5/+2
|\ \ | | | | | | web: Fix #1888
| * | web: Fix #1888Sachin Kelkar2017-03-032-5/+2
| | |
* | | Merge pull request #2053 from krsoninikhil/on-issuesMaximilian Hils2017-03-047-13/+35
|\ \ \ | | | | | | | | Adds --keep-host-header option (#2039)
| * | | update docs wordingMaximilian Hils2017-03-041-2/+2
| | | |
| * | | Merge branch 'master' into on-issuesNikhil Soni2017-03-0356-680/+1674
| |\ \ \ | |/ / / |/| | |
* | | | docs: fix cert install linkMaximilian Hils2017-03-021-1/+1
| | | |
* | | | docs: http -> https where possibleMaximilian Hils2017-03-021-6/+6
| | | |
* | | | Merge pull request #2087 from TomTasche/patch-1Maximilian Hils2017-03-021-1/+1
|\ \ \ \ | |_|_|/ |/| | | link to stackoverflow for chrome certificate management
| * | | link to stackoverflow for chrome certificate managementThomas Taschauer2017-03-021-1/+1
|/ / /
* | / http2: fix h2 header normalization test (#2080)Thomas Kriechbaumer2017-03-012-72/+0
| |/ |/|
* | added XSS scanner example (#1907)David Dworken2017-02-272-0/+775
| |
* | Merge pull request #2072 from MatthewShao/devThomas Kriechbaumer2017-02-271-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 Shao2017-02-271-0/+1
|/ /
* | Merge pull request #2069 from JordanLoehr/iss2068Maximilian Hils2017-02-271-2/+2
|\ \ | | | | | | Added console_ prefix to options in palettepicker to resolve issue #2068
| * | Added console_ prefix to options in palettepicket to resolve issue #2068Jordan Loehr2017-02-261-2/+2
| | |
* | | Merge pull request #2067 from whackashoe/fix-2065Maximilian Hils2017-02-261-1/+1
|\ \ \ | | | | | | | | fix #2065 by setting correct content encoding for brotli
| * | | fix #2065 by setting correct content encoding for brotliJett2017-02-261-1/+1
| |/ /
* | | Merge pull request #2066 from Kriechi/certs-testsThomas Kriechbaumer2017-02-264-17/+39
|\ \ \ | | | | | | | | certs: coverage++
| * | | do not return IP addresses in SSLCert.altnamesThomas Kriechbaumer2017-02-262-2/+3
| | | |
| * | | certs: coverage++Thomas Kriechbaumer2017-02-264-17/+38
|/ / /
* | | connections: coverage++ (#2064)Thomas Kriechbaumer2017-02-265-41/+211
| | |
* | | Merge pull request #2063 from ujjwal96/hardump-supportMaximilian Hils2017-02-262-8/+3
|\ \ \ | |/ / |/| | Remove pytz in hardump
| * | Remove pytz in hardumpUjjwal Verma2017-02-252-8/+3
|/ /
* | optmanager: coverage++ (#2062)Thomas Kriechbaumer2017-02-252-9/+15
| |
* | http: coverage++ (#2060)Thomas Kriechbaumer2017-02-242-2/+25
| |
* | move tests around (#2059)Thomas Kriechbaumer2017-02-242-225/+232
| |
* | move tests around (#2058)Thomas Kriechbaumer2017-02-243-67/+68
| |
* | Merge pull request #2057 from Kriechi/flowfilter-coverageThomas Kriechbaumer2017-02-246-4/+105
|\ \ | | | | | | flowfilter: coverage++
| * | flowfilter: coverage++Thomas Kriechbaumer2017-02-246-4/+105
|/ /
* | Merge pull request #2050 from Kriechi/create_connectionThomas Kriechbaumer2017-02-2438-254/+210
|\ \ | | | | | | nuke tcp.Address and add proper IPv6 support
| * | fix constant definitionMaximilian Hils2017-02-241-4/+3
| | |
| * | nuke tcp.Address and add proper IPv6 supportThomas Kriechbaumer2017-02-2438-254/+211
|/ /
* | Merge pull request #2055 from Kriechi/http2-normalize-headersThomas Kriechbaumer2017-02-231-2/+0
|\ \ | | | | | | http2: normalize headers before sending