aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * | http2: normalize headers before sendingThomas Kriechbaumer2017-02-231-2/+0
| | |
* | | Merge pull request #2048 from ujjwal96/ipv6-addressesMaximilian Hils2017-02-222-2/+13
|\ \ \ | |/ / |/| | Absolute IPv6 addresses supported
| * | minor changesMaximilian Hils2017-02-211-3/+6
| | |
| * | Absolute IPv6 addresses supportedUjjwal Verma2017-02-202-1/+9
| | |
| | * Adds test for --keep-host-headerNikhil Soni2017-03-031-0/+20
| | |
| | * Changes dns_spoofing example to use --keep-host-headerNikhil Soni2017-03-032-10/+3
| | |
| | * Updates help msg and docs for --keep-host-headerNikhil Soni2017-03-032-3/+4
| | |
| | * Adds --keep-host-header option (#2039)Nikhil Soni2017-02-223-1/+9
| |/ |/|
* | Merge pull request #2018 from dlenski/save_mitm_certThomas Kriechbaumer2017-02-213-2/+9
|\ \
| * | update compatThomas Kriechbaumer2017-02-211-1/+1
| | |
| * | minor adjustmentsMaximilian Hils2017-02-212-4/+3
| | |
| * | store generated cert for each flowDaniel Lenski2017-02-214-0/+8
|/ / | | | | | | fixes #1935
* | lint!Thomas Kriechbaumer2017-02-211-0/+2
| |
* | bump dev versionThomas Kriechbaumer2017-02-212-1/+5
| |
* | update CHANGELOG with 2.0.0 releaseThomas Kriechbaumer2017-02-211-0/+23
| |
* | Update README.mdMaximilian Hils2017-02-211-1/+1
| |
* | Update README.mdMaximilian Hils2017-02-211-0/+1
| |
* | [web] yarn? yarn.Maximilian Hils2017-02-212-32/+5318
| |
* | Merge pull request #2051 from MatthewShao/fix-#1928-@concurrent-in-OOPMaximilian Hils2017-02-213-1/+36
|\ \ | | | | | | Fix #1928, @concurrent decorator in class
| * | docs++Maximilian Hils2017-02-211-0/+1
| | |
| * | Add test for @concurrent decorator in class.Matthew Shao2017-02-212-0/+31
| | |
| * | Fix #1928, @concurrent decorator now works for class methods.Matthew Shao2017-02-211-1/+4
| |/
* / update mitmweb resourcesMaximilian Hils2017-02-213-428/+746
|/
* Merge pull request #2047 from Kriechi/lymanZerga11-patch-1Thomas Kriechbaumer2017-02-201-3/+3
|\ | | | | improve tests
| * improve testThomas Kriechbaumer2017-02-201-3/+3
|/
* Merge pull request #2017 from lymanZerga11/patch-1Thomas Kriechbaumer2017-02-202-3/+25
|\ | | | | Catch ValueErrors from url.parse()
| * Update test_flowlist.pylymanZerga112017-02-141-4/+3
| |
| * Update test_flowlist.pylymanZerga112017-02-141-13/+4
| |