aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * proxy.protocol.http: flatten for refactoringAldo Cortesi2016-11-121-189/+150
|/
* Merge pull request #1723 from Kriechi/http2-connsMaximilian Hils2016-11-091-47/+48
|\
| * http2: move h2 connection objectThomas Kriechbaumer2016-11-051-47/+48
* | Merge pull request #1725 from mhils/mitmwebMaximilian Hils2016-11-0930-62130/+1079
|\ \
| * | mitmweb: minor fixesMaximilian Hils2016-11-095-7/+37
| * | web: update static assetsMaximilian Hils2016-11-093-61000/+495
| * | web: fix header updateMaximilian Hils2016-11-091-26/+27
| * | web: simplify flow storageMaximilian Hils2016-11-0817-573/+363
| * | clean up mitmwebMaximilian Hils2016-11-0821-3059/+2692
| * | fix mitmwebMaximilian Hils2016-11-082-3/+3
| |/
* | Merge pull request #1724 from phackt/masterMaximilian Hils2016-11-091-0/+5
|\ \ | |/ |/|
| * explain host=pretty_host assignmentMaximilian Hils2016-11-091-0/+4
| * fix SNI for transparent mode - #1638phackt2016-11-081-0/+1
|/
* http2: add push-promise metadata testThomas Kriechbaumer2016-11-051-0/+6
* Merge pull request #1716 from cortesi/deprecated2Aldo Cortesi2016-11-041-11/+0
|\
| * Remove sticky[auth,cookie] from http objectsAldo Cortesi2016-11-041-11/+0
* | Merge pull request #1715 from cortesi/deprecatedAldo Cortesi2016-11-046-42/+10
|\|
| * Remove deprecated interfacesAldo Cortesi2016-11-046-42/+10
* | Merge pull request #1714 from cortesi/justno2Aldo Cortesi2016-11-0414-45/+45
|\|
| * Let's not over-ride __bool__ on connection objectsAldo Cortesi2016-11-0412-21/+21
| * script.concurrent: tests to taddonsAldo Cortesi2016-11-042-24/+24
|/
* Merge pull request #1711 from navinpai/1541Aldo Cortesi2016-11-041-1/+3
|\
| * Allow forever wait at end of message #1541Naveen Pai2016-11-041-1/+3
* | Merge pull request #1712 from navinpai/docsAldo Cortesi2016-11-041-1/+4
|\ \ | |/ |/|
| * [MINOR] fix link in documentationNaveen Pai2016-11-041-1/+4
|/
* Merge pull request #1709 from cortesi/taddons4Aldo Cortesi2016-11-049-178/+214
|\
| * addons: convert last of the test suite to taddonsAldo Cortesi2016-11-045-94/+92
| * addons.setheaders: fix configure bug, tests to taddonsAldo Cortesi2016-11-042-56/+54
| * addons.view: test suite to 100%Aldo Cortesi2016-11-042-28/+68
|/
* Merge pull request #1708 from cortesi/taddons3Aldo Cortesi2016-11-045-18/+67
|\
| * addons.view: test improvementsAldo Cortesi2016-11-032-2/+52
| * README.rst: recommend "tox -e lint" over using flake8 directlyAldo Cortesi2016-11-031-2/+3
| * addons.streambodies: 100% test coverageAldo Cortesi2016-11-032-14/+12
* | Merge pull request #1707 from cortesi/taddons2Aldo Cortesi2016-11-034-336/+434
|\|
| * addons.serverplayback: 100% test coverageAldo Cortesi2016-11-032-271/+318
| * addons.serverplayback: test suite to taddonsAldo Cortesi2016-11-031-58/+61
| * addons.script: 100% test coverageAldo Cortesi2016-11-032-2/+52
| * addons.script: convert to test.taddonsAldo Cortesi2016-11-031-100/+98
* | Merge pull request #1706 from cortesi/taddonsAldo Cortesi2016-11-0313-132/+119
|\|
| * addons.onboarding: remove duplicate codeAldo Cortesi2016-11-032-17/+1
| * addons.intercept: 100% test coverageAldo Cortesi2016-11-031-0/+5
| * streamfile: make options less crazyAldo Cortesi2016-11-038-56/+19
| * FileStreamer -> StreamFileAldo Cortesi2016-11-038-38/+37
| * addons: filestreamer test cov to 100%Aldo Cortesi2016-11-034-22/+69
| * addons filstreamer: tests and bugfixesAldo Cortesi2016-11-033-42/+31
* | Merge pull request #1705 from cortesi/testsAldo Cortesi2016-11-032-4/+6
|\|
| * Change antiquated test cipher suitesAldo Cortesi2016-11-031-4/+4
| * tests: add mitmdump --sysinfo to tests runs for platform infoAldo Cortesi2016-11-031-0/+2
* | Merge pull request #1704 from cortesi/addontest4Aldo Cortesi2016-11-034-92/+223
|\|
| * addons: dumper spit and polishAldo Cortesi2016-11-024-92/+223