aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* raise TypeError on invalid header assignment, fix #1562Maximilian Hils2016-09-214-1/+16
|
* Merge pull request #1509 from arjun23496/regex_star_modMaximilian Hils2016-09-212-2/+5
|\ | | | | Fixes #1471 - Change .* to match entire body
| * Changed filter to match replacement for DOTALLarjun234962016-09-091-0/+3
| |
| * Convert to flags=value for future compatibilityarjun234962016-09-091-2/+2
| |
| * Fixes #1471 - Change .* to match entire bodyarjun234962016-09-091-2/+2
| |
* | Merge pull request #1559 from dwfreed/patch-1Thomas Kriechbaumer2016-09-181-1/+1
|\ \ | | | | | | console/options: kill -> replay_kill_extra
| * | console/options: kill -> replay_kill_extraDoug Freed2016-09-171-1/+1
|/ / | | | | | | | | @cortesi renamed the kill option to replay_kill_extra in b0213a2, but missed a usage here because it was in a string. This fixes opening the options menu in console.
* | Merge pull request #1558 from vulnminer/patch-1Thomas Kriechbaumer2016-09-171-1/+1
|\ \ | | | | | | Update app.py
| * | Update app.pyvulnminer2016-09-171-1/+1
|/ /
* | Merge pull request #1552 from cortesi/creplayAldo Cortesi2016-09-1217-216/+156
|\ \ | | | | | | revamp client replay
| * | 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
| | | | | | | | | | | | | | | - Move to an addon - Use a much simpler synchronisation mechanism
* | | Merge pull request #1553 from Kriechi/bumpThomas Kriechbaumer2016-09-111-1/+1
|\ \ \ | | | | | | | | bump brotlipy
| * | | bump brotlipyThomas Kriechbaumer2016-09-111-1/+1
|/ / /
* | | Merge pull request #1551 from cortesi/sreplayAldo Cortesi2016-09-113-42/+24
|\| | | | | | | | console: fix/improve server replay
| * | console: fix/improve server replayAldo Cortesi2016-09-113-42/+24
|/ / | | | | | | | | | | - Fix "S" shortcut in list view - Consolidate replay from file in global R shortcut - Fix help
* | Merge pull request #1550 from cortesi/scriptAldo Cortesi2016-09-115-61/+72
|\ \ | | | | | | Add "run_once" support to the script addon, use it in mitmproxy
| * | Add "run_once" support to the script addon, use it in mitmproxyAldo Cortesi2016-09-115-61/+72
|/ / | | | | | | Fixes #1418
* | Merge pull request #1548 from cortesi/optsAldo Cortesi2016-09-1010-88/+76
|\ \ | | | | | | Make various replay-related options clearer
| * | 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 tests
| * Roll out synchronisation for mitmproxy testsAldo Cortesi2016-09-1011-226/+265
| | | | | | | | | | | | | | | | | | This extends some of the work I did for pathod and netlib to the mitmproxy test suite. It also fixes what may be a leak in replays. Failing on connection leak is disabled on Windows for the moment. Fixes #1535
* | Merge pull request #1542 from cortesi/replayconsoleAldo Cortesi2016-09-096-49/+36
|\ \ | |/ |/| Fix server replay in mitmproxy console
| * 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
|\ | | | | Playback and fix construct breakage
| * 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
| | | | | | | | | | | | | | | | | | | | | | - Move server playback into an addon - Implement a better sync strategy to decide when to exit if keepserving is off. We now wait for the final flow played back to no longer be live. - Leave interactive server playback in mitmproxy console broken for now - there are broader addon-related changes that need to be made for that, and this patch is already big. Fixes #1229
* | Merge pull request #1531 from Schamper/encoding-patchThomas Kriechbaumer2016-09-062-3/+9
|\ \ | |/ |/| Fix decoding when content-encoding: none
| * 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
|\ | | | | bump brotli dependency
| * 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
|\ | | | | improve error handling in http2
| * 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
| |