aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #1552 from cortesi/creplayAldo Cortesi2016-09-1217-216/+156
|\ \ \
| * | | Misc cleanupsAldo Cortesi2016-09-123-14/+15
| * | | console: update flow list when state is modifiedAldo Cortesi2016-09-111-0/+2
| * | | Remove obsolete exceptions.ScriptExceptionAldo Cortesi2016-09-111-24/+0
| * | | Redesign client replayAldo Cortesi2016-09-1116-180/+141
* | | | Merge pull request #1553 from Kriechi/bumpThomas Kriechbaumer2016-09-111-1/+1
|\ \ \ \
| * | | | bump brotlipyThomas Kriechbaumer2016-09-111-1/+1
|/ / / /
* | | | Merge pull request #1551 from cortesi/sreplayAldo Cortesi2016-09-113-42/+24
|\| | |
| * | | console: fix/improve server replayAldo Cortesi2016-09-113-42/+24
|/ / /
* | | Merge pull request #1550 from cortesi/scriptAldo Cortesi2016-09-115-61/+72
|\ \ \
| * | | Add "run_once" support to the script addon, use it in mitmproxyAldo Cortesi2016-09-115-61/+72
|/ / /
* | | Merge pull request #1548 from cortesi/optsAldo Cortesi2016-09-1010-88/+76
|\ \ \
| * | | options.replay_ignore* -> options.server_replay_ignore*Aldo Cortesi2016-09-106-52/+42
| * | | options.nopop -> options.server_replay_nopopAldo Cortesi2016-09-105-11/+10
| * | | options.rheaders -> options.server_replay_use_headersAldo Cortesi2016-09-105-11/+11
| * | | options.kill -> options.replay_kill_extraAldo Cortesi2016-09-109-18/+17
|/ / /
* | | Merge pull request #1545 from cortesi/tsyncAldo Cortesi2016-09-105-177/+229
|\ \ \ | |/ / |/| |
| * | Roll out synchronisation for mitmproxy testsAldo Cortesi2016-09-1011-226/+265
* | | Merge pull request #1542 from cortesi/replayconsoleAldo Cortesi2016-09-096-49/+36
|\ \ \ | |/ / |/| |
| * | Fix interactive server replay in mitmproxy consoleAldo Cortesi2016-09-096-46/+28
| * | Extend addons.Addons with a get method that retrieves an addon by nameAldo Cortesi2016-09-092-1/+9
| * | Fix immediate server replay-related crash in mitmproxyAldo Cortesi2016-09-092-6/+3
|/ /
* | Merge pull request #1532 from cortesi/playbackAldo Cortesi2016-09-0711-491/+433
|\ \
| * | Fix byte/string comparison error in server playbackAldo Cortesi2016-09-071-5/+11
| * | Move server playback in to an addonAldo Cortesi2016-09-0611-491/+427
* | | Merge pull request #1531 from Schamper/encoding-patchThomas Kriechbaumer2016-09-062-3/+9
|\ \ \ | |/ / |/| |
| * | Make 'none' synonymous to 'identity'Schamper2016-09-062-10/+11
| * | Add testSchamper2016-09-061-0/+5
| * | Also fix for encodingSchamper2016-09-061-1/+1
| * | Fix decoding when content-encoding: noneSchamper2016-09-061-1/+1
|/ /
* | Merge pull request #1515 from Kriechi/bump-brotliAldo Cortesi2016-09-053-35/+39
|\ \
| * | change test valueThomas Kriechbaumer2016-09-041-1/+1
| * | improve netlib.encodingThomas Kriechbaumer2016-09-042-34/+38
| * | bump brotli dependencyThomas Kriechbaumer2016-09-041-1/+1
|/ /
* | Merge pull request #1523 from Kriechi/http2Aldo Cortesi2016-09-0410-70/+112
|\ \ | |/ |/|
| * http2: improve connection lostThomas Kriechbaumer2016-09-031-1/+2
| * improve CIThomas Kriechbaumer2016-09-032-1/+2
| * http2: improve kill and cleanup threadsThomas Kriechbaumer2016-09-032-11/+16
| * http2: assemble connect-request from objectThomas Kriechbaumer2016-09-031-7/+12
| * http2: fixesThomas Kriechbaumer2016-09-033-9/+16
| * http2: improve framereaderThomas Kriechbaumer2016-09-036-24/+29
| * http2: improve closed connection handlingThomas Kriechbaumer2016-09-031-6/+16
| * http2: improve zombie exception handlingThomas Kriechbaumer2016-09-032-2/+8
| * cleanupThomas Kriechbaumer2016-09-032-17/+19
|/
* Merge pull request #1513 from Kriechi/bump-depAldo Cortesi2016-09-032-2/+2
|\
| * cleanup travisThomas Kriechbaumer2016-09-011-1/+1
| * cryptography 1.5Thomas Kriechbaumer2016-09-011-1/+1
* | Merge pull request #1482 from Kriechi/improve-docsAldo Cortesi2016-09-032-89/+89
|\ \ | |/ |/|
| * update docs: introductionThomas Kriechbaumer2016-08-171-11/+10
| * update docs: how mitmproxy worksThomas Kriechbaumer2016-08-151-78/+79