Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1509 from arjun23496/regex_star_mod | Maximilian Hils | 2016-09-21 | 2 | -2/+5 |
|\ | | | | | Fixes #1471 - Change .* to match entire body | ||||
| * | Changed filter to match replacement for DOTALL | arjun23496 | 2016-09-09 | 1 | -0/+3 |
| | | |||||
| * | Convert to flags=value for future compatibility | arjun23496 | 2016-09-09 | 1 | -2/+2 |
| | | |||||
| * | Fixes #1471 - Change .* to match entire body | arjun23496 | 2016-09-09 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #1559 from dwfreed/patch-1 | Thomas Kriechbaumer | 2016-09-18 | 1 | -1/+1 |
|\ \ | | | | | | | console/options: kill -> replay_kill_extra | ||||
| * | | console/options: kill -> replay_kill_extra | Doug Freed | 2016-09-17 | 1 | -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-1 | Thomas Kriechbaumer | 2016-09-17 | 1 | -1/+1 |
|\ \ | | | | | | | Update app.py | ||||
| * | | Update app.py | vulnminer | 2016-09-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1552 from cortesi/creplay | Aldo Cortesi | 2016-09-12 | 17 | -216/+156 |
|\ \ | | | | | | | revamp client replay | ||||
| * | | Misc cleanups | Aldo Cortesi | 2016-09-12 | 3 | -14/+15 |
| | | | |||||
| * | | console: update flow list when state is modified | Aldo Cortesi | 2016-09-11 | 1 | -0/+2 |
| | | | |||||
| * | | Remove obsolete exceptions.ScriptException | Aldo Cortesi | 2016-09-11 | 1 | -24/+0 |
| | | | |||||
| * | | Redesign client replay | Aldo Cortesi | 2016-09-11 | 16 | -180/+141 |
| | | | | | | | | | | | | | | | - Move to an addon - Use a much simpler synchronisation mechanism | ||||
* | | | Merge pull request #1553 from Kriechi/bump | Thomas Kriechbaumer | 2016-09-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | bump brotlipy | ||||
| * | | | bump brotlipy | Thomas Kriechbaumer | 2016-09-11 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1551 from cortesi/sreplay | Aldo Cortesi | 2016-09-11 | 3 | -42/+24 |
|\| | | | | | | | | console: fix/improve server replay | ||||
| * | | console: fix/improve server replay | Aldo Cortesi | 2016-09-11 | 3 | -42/+24 |
|/ / | | | | | | | | | | | - Fix "S" shortcut in list view - Consolidate replay from file in global R shortcut - Fix help | ||||
* | | Merge pull request #1550 from cortesi/script | Aldo Cortesi | 2016-09-11 | 5 | -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 mitmproxy | Aldo Cortesi | 2016-09-11 | 5 | -61/+72 |
|/ / | | | | | | | Fixes #1418 | ||||
* | | Merge pull request #1548 from cortesi/opts | Aldo Cortesi | 2016-09-10 | 10 | -88/+76 |
|\ \ | | | | | | | Make various replay-related options clearer | ||||
| * | | options.replay_ignore* -> options.server_replay_ignore* | Aldo Cortesi | 2016-09-10 | 6 | -52/+42 |
| | | | |||||
| * | | options.nopop -> options.server_replay_nopop | Aldo Cortesi | 2016-09-10 | 5 | -11/+10 |
| | | | |||||
| * | | options.rheaders -> options.server_replay_use_headers | Aldo Cortesi | 2016-09-10 | 5 | -11/+11 |
| | | | |||||
| * | | options.kill -> options.replay_kill_extra | Aldo Cortesi | 2016-09-10 | 9 | -18/+17 |
|/ / | |||||
* | | Merge pull request #1545 from cortesi/tsync | Aldo Cortesi | 2016-09-10 | 5 | -177/+229 |
|\ \ | |/ |/| | Roll out synchronisation for mitmproxy tests | ||||
| * | Roll out synchronisation for mitmproxy tests | Aldo Cortesi | 2016-09-10 | 11 | -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/replayconsole | Aldo Cortesi | 2016-09-09 | 6 | -49/+36 |
|\ \ | |/ |/| | Fix server replay in mitmproxy console | ||||
| * | Fix interactive server replay in mitmproxy console | Aldo Cortesi | 2016-09-09 | 6 | -46/+28 |
| | | |||||
| * | Extend addons.Addons with a get method that retrieves an addon by name | Aldo Cortesi | 2016-09-09 | 2 | -1/+9 |
| | | |||||
| * | Fix immediate server replay-related crash in mitmproxy | Aldo Cortesi | 2016-09-09 | 2 | -6/+3 |
|/ | |||||
* | Merge pull request #1532 from cortesi/playback | Aldo Cortesi | 2016-09-07 | 11 | -491/+433 |
|\ | | | | | Playback and fix construct breakage | ||||
| * | Fix byte/string comparison error in server playback | Aldo Cortesi | 2016-09-07 | 1 | -5/+11 |
| | | |||||
| * | Move server playback in to an addon | Aldo Cortesi | 2016-09-06 | 11 | -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-patch | Thomas Kriechbaumer | 2016-09-06 | 2 | -3/+9 |
|\ \ | |/ |/| | Fix decoding when content-encoding: none | ||||
| * | Make 'none' synonymous to 'identity' | Schamper | 2016-09-06 | 2 | -10/+11 |
| | | |||||
| * | Add test | Schamper | 2016-09-06 | 1 | -0/+5 |
| | | |||||
| * | Also fix for encoding | Schamper | 2016-09-06 | 1 | -1/+1 |
| | | |||||
| * | Fix decoding when content-encoding: none | Schamper | 2016-09-06 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1515 from Kriechi/bump-brotli | Aldo Cortesi | 2016-09-05 | 3 | -35/+39 |
|\ | | | | | bump brotli dependency | ||||
| * | change test value | Thomas Kriechbaumer | 2016-09-04 | 1 | -1/+1 |
| | | |||||
| * | improve netlib.encoding | Thomas Kriechbaumer | 2016-09-04 | 2 | -34/+38 |
| | | |||||
| * | bump brotli dependency | Thomas Kriechbaumer | 2016-09-04 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1523 from Kriechi/http2 | Aldo Cortesi | 2016-09-04 | 10 | -70/+112 |
|\ | | | | | improve error handling in http2 | ||||
| * | http2: improve connection lost | Thomas Kriechbaumer | 2016-09-03 | 1 | -1/+2 |
| | | |||||
| * | improve CI | Thomas Kriechbaumer | 2016-09-03 | 2 | -1/+2 |
| | | |||||
| * | http2: improve kill and cleanup threads | Thomas Kriechbaumer | 2016-09-03 | 2 | -11/+16 |
| | | |||||
| * | http2: assemble connect-request from object | Thomas Kriechbaumer | 2016-09-03 | 1 | -7/+12 |
| | | |||||
| * | http2: fixes | Thomas Kriechbaumer | 2016-09-03 | 3 | -9/+16 |
| | | |||||
| * | http2: improve framereader | Thomas Kriechbaumer | 2016-09-03 | 6 | -24/+29 |
| | | |||||
| * | http2: improve closed connection handling | Thomas Kriechbaumer | 2016-09-03 | 1 | -6/+16 |
| | |