aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* 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
* bump version for next release cycleMaximilian Hils2016-12-271-1/+1
* Merge pull request #1887 from Kriechi/h2-enableThomas Kriechbaumer2016-12-271-3/+2
|\
| * enable HTTP/2 by defaultThomas Kriechbaumer2016-12-261-3/+2
* | bump version to 1.0.1Maximilian Hils2016-12-271-1/+1
* | py36: fix type informationThomas Kriechbaumer2016-12-271-7/+20
|/
* Merge branch 'master' into adminAldo Cortesi2016-12-2414-42/+93
|\
| * remove output of dumper during testsThomas Kriechbaumer2016-12-212-5/+8
| * Merge pull request #1881 from mhils/fix-alpn-bytesThomas Kriechbaumer2016-12-204-6/+26
| |\
| | * always decode alpn where requiredMaximilian Hils2016-12-204-6/+26
| * | Merge pull request #1880 from mhils/1877Maximilian Hils2016-12-191-1/+5
| |\ \ | | |/ | |/|
| | * fix #1877Maximilian Hils2016-12-191-1/+5
| * | fix io compat with previous releasesMaximilian Hils2016-12-191-4/+6
| |/
| * Merge pull request #1876 from mhils/1858Maximilian Hils2016-12-192-15/+24
| |\
| | * fix #1858Maximilian Hils2016-12-192-15/+24
| * | Merge pull request #1875 from Kriechi/dont-log-tracebacksThomas Kriechbaumer2016-12-173-9/+3
| |\ \
| | * | don't log full tracebacksThomas Kriechbaumer2016-12-173-9/+3
| * | | fix #1867 (#1873)Maximilian Hils2016-12-171-2/+1
| |/ /
| * | display ALPN informationThomas Kriechbaumer2016-12-174-3/+23
| * | Merge pull request #1870 from Kriechi/http2-timeoutsThomas Kriechbaumer2016-12-171-2/+2
| |\ \ | | |/ | |/|
| | * http2: faster timeoutsThomas Kriechbaumer2016-12-171-2/+2
* | | Compat 0.19 -> 1.0Aldo Cortesi2016-12-171-0/+6
* | | Administrivia: docs for new config file, minor adjustmentsAldo Cortesi2016-12-171-1/+1
* | | Release administrivia: changelog stub, contributors, bump to v1.0Aldo Cortesi2016-12-171-1/+1
|/ /
* / Addon test docs, remove stray deprecated eventsAldo Cortesi2016-12-171-3/+0
|/
* Merge pull request #1863 from Kriechi/disable-h2cAldo Cortesi2016-12-172-0/+23
|\
| * disable h2c upgradesThomas Kriechbaumer2016-12-162-0/+23
* | Merge pull request #1862 from mhils/remove-intercept-eventsAldo Cortesi2016-12-176-26/+27
|\ \
| * | remove intercept events, update view manuallyMaximilian Hils2016-12-166-26/+27
* | | Merge pull request #1861 from cortesi/markingAldo Cortesi2016-12-162-3/+7
|\ \ \ | |_|/ |/| |
| * | console: mark view indiciator, fix empty flow list behaviourAldo Cortesi2016-12-162-3/+7
| |/
* / Catch occasional protocol errors in regular connectAldo Cortesi2016-12-161-11/+11
|/
* Merge pull request #1845 from mhils/mitmweb-improvementsAldo Cortesi2016-12-167-493/+58563
|\
| * [web] various fixesMaximilian Hils2016-12-126-354/+542
| * [web] show proxy address, add websocket toggleMaximilian Hils2016-12-115-488/+58370
* | Merge pull request #1852 from mhils/simplenamespaceMaximilian Hils2016-12-131-15/+3
|\ \
| * | use types.SimpleNamespace instead of custom NS classMaximilian Hils2016-12-131-15/+3
* | | fix #1850Maximilian Hils2016-12-134-35/+45
|/ /
* | console: respect follow in eventlogDoug Freed2016-12-122-1/+5