aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1988 from krsoninikhil/ordereddictMaximilian Hils2017-02-041-1/+1
|\
| * Changes view._store from dict to OrderedDictNikhil Soni2017-02-041-1/+1
* | Merge pull request #1967 from s4chin/remove-pillowMaximilian Hils2017-02-034-1/+329
|\ \
| * | FeedbackSachin Kelkar2017-02-033-5/+7
| * | Fix and cleanupSachin Kelkar2017-02-032-10/+12
| * | Add iTXt and zTXt testsSachin Kelkar2017-02-032-1/+37
| * | Fix as per feedback and add more testsSachin Kelkar2017-02-034-32/+20
| * | Add png parserSachin Kelkar2017-02-035-4/+304
* | | Merge pull request #1983 from Kriechi/coverage++Maximilian Hils2017-02-031-1/+1
|\ \ \ | |_|/ |/| |
| * | coverage++Thomas Kriechbaumer2017-02-031-1/+1
| |/
* / Closes #1960 'Z' removes unmarked flowsUjjwal Verma2017-02-032-0/+14
|/
* fix mergeThomas Kriechbaumer2017-02-021-5/+6
* Merge pull request #1979 from 0neblock/masterMaximilian Hils2017-02-021-1/+1
|\
| * Fixed following on flowlistAidan Cyr2017-02-021-1/+1
* | replace tutils.raises with pytest.raises + shimThomas Kriechbaumer2017-02-021-59/+0
* | cleanup test utilsThomas Kriechbaumer2017-02-022-7/+27
|/
* increase test coverageThomas Kriechbaumer2017-02-024-10/+12
* fix linting errorThomas Kriechbaumer2017-02-021-1/+0
* Add except clause to catch script parsing errors (#1929)lymanZerga112017-02-012-7/+13
* Regularise setheaders optionsAldo Cortesi2017-02-014-67/+56
* Revamp replacement hooksAldo Cortesi2017-02-015-66/+85
* Merge pull request #1965 from cortesi/optnameAldo Cortesi2017-02-0112-164/+174
|\
| * Consolidate option namesAldo Cortesi2017-01-3012-164/+174
* | :see_no_evil:Maximilian Hils2017-01-301-0/+2
|/
* simplify termlog outfile handlingThomas Kriechbaumer2017-01-251-9/+6
* write errors to stderr (#1952)nish212017-01-251-0/+8
* Merge pull request #1956 from Kriechi/version-stringThomas Kriechbaumer2017-01-231-1/+15
|\
| * improve version specifiersThomas Kriechbaumer2017-01-231-1/+15
* | Merge pull request #1945 from Kriechi/ca-expiredMaximilian Hils2017-01-237-39/+68
|\ \
| * | fix #939Thomas Kriechbaumer2017-01-237-39/+68
| |/
* | test disable_h2c_upgrade addonThomas Kriechbaumer2017-01-231-0/+1
* | test websocket addonThomas Kriechbaumer2017-01-231-0/+55
|/
* Merge pull request #1940 from s4chin/add-marked-filterMaximilian Hils2017-01-201-0/+1
|\
| * web: Add ~marked filterSachin Kelkar2017-01-201-0/+1
* | provide git information with --versionThomas Kriechbaumer2017-01-196-23/+30
|/
* console: display http version in detailsMaximilian Hils2017-01-101-2/+7
* mitmdump: fix reading from stdinMaximilian Hils2017-01-101-2/+5
* stronger tests, lintMaximilian Hils2017-01-071-1/+0
* fix #1910Maximilian Hils2017-01-071-1/+1
* minor legibility improvementsMaximilian Hils2017-01-071-8/+17
* Revert "add strutils.replace_surrogates"Maximilian Hils2017-01-071-11/+0
* add strutils.replace_surrogatesMaximilian Hils2017-01-071-0/+11
* minor encoding fixesMaximilian Hils2017-01-076-48/+39
* fix HTTP reason phrase encodingMaximilian Hils2017-01-071-2/+4
* Controls the length of URL displayed using the -d option (#1903)lymanZerga112017-01-051-0/+4
* Fixed edit form failedchhsiao902016-12-311-2/+2
* Allow underscore in hostnamechhsiao902016-12-301-1/+2
* fix IO type checkingMaximilian Hils2016-12-281-0/+2
* fix compat with Python 3.5.0Maximilian Hils2016-12-281-8/+13
* update io compat for 2.0Maximilian Hils2016-12-271-0/+6