Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
| | | ||||||
| * | http2: improve zombie exception handling | Thomas Kriechbaumer | 2016-09-03 | 2 | -2/+8 | |
| | | ||||||
| * | cleanup | Thomas Kriechbaumer | 2016-09-03 | 2 | -17/+19 | |
|/ | ||||||
* | Merge pull request #1513 from Kriechi/bump-dep | Aldo Cortesi | 2016-09-03 | 2 | -2/+2 | |
|\ | | | | | cryptography 1.5 | |||||
| * | cleanup travis | Thomas Kriechbaumer | 2016-09-01 | 1 | -1/+1 | |
| | | ||||||
| * | cryptography 1.5 | Thomas Kriechbaumer | 2016-09-01 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #1482 from Kriechi/improve-docs | Aldo Cortesi | 2016-09-03 | 2 | -89/+89 | |
|\ \ | |/ |/| | update docs: how mitmproxy works | |||||
| * | update docs: introduction | Thomas Kriechbaumer | 2016-08-17 | 1 | -11/+10 | |
| | | ||||||
| * | update docs: how mitmproxy works | Thomas Kriechbaumer | 2016-08-15 | 1 | -78/+79 | |
| | | ||||||
* | | Merge pull request #1488 from mitmproxy/websockets | Thomas Kriechbaumer | 2016-09-01 | 24 | -489/+967 | |
|\ \ | | | | | | | add WebSockets support | |||||
| * | | cleanup tests | Thomas Kriechbaumer | 2016-09-01 | 4 | -3/+7 | |
| | | | ||||||
| * | | add docs for websocket_handshake hook | Thomas Kriechbaumer | 2016-09-01 | 1 | -0/+12 | |
| | | | ||||||
| * | | websockets: update protocol detection | Thomas Kriechbaumer | 2016-09-01 | 6 | -59/+39 | |
| | | | ||||||
| * | | add websockets support to mitmproxy | Thomas Kriechbaumer | 2016-09-01 | 7 | -9/+465 | |
| | | | ||||||
| * | | websockets: refactor implementation and add tests | Thomas Kriechbaumer | 2016-09-01 | 9 | -473/+499 | |
|/ / | ||||||
* | | Merge pull request #1517 from cortesi/httperrs | Thomas Kriechbaumer | 2016-09-01 | 2 | -27/+39 | |
|\ \ | | | | | | | Improve the way we handle upstream errors | |||||
| * | | Improve the way we handle upstream errors | Aldo Cortesi | 2016-09-01 | 2 | -27/+39 | |
|/ / | | | | | | | | | | | | | - Don't log a traceback for either HTTP or HTTPS DNS resolution or TCP connection errors. These are "ordinary" errors, not mitmproxy issues. - Ensure that the error handler is correctly called for SSL-related protocol errors. | |||||
* | | Adjust flowbasic example for Options API changes | Aldo Cortesi | 2016-09-01 | 1 | -11/+13 | |
| | | ||||||
* | | Merge pull request #1511 from arjun23496/count_in_replace | Thomas Kriechbaumer | 2016-08-31 | 6 | -9/+38 | |
|\ \ | | | | | | | Fixes #1495 - Added count argument for replacing contents in body | |||||
| * | | Lint fix - minor | arjun23496 | 2016-08-31 | 2 | -3/+2 | |
| | | | ||||||
| * | | Lint fix - replace tests | arjun23496 | 2016-08-31 | 3 | -6/+9 | |
| | | | ||||||
| * | | Lint fix - netlib headers | arjun23496 | 2016-08-31 | 1 | -4/+2 | |
| | | | ||||||
| * | | minor bug fix header replace | arjun23496 | 2016-08-31 | 1 | -3/+7 | |
| | | | ||||||
| * | | Added tests for replace in request,message,header | arjun23496 | 2016-08-31 | 4 | -1/+25 | |
| | | | ||||||
| * | | Minor bug fix - messages.py replace | arjun23496 | 2016-08-29 | 1 | -1/+1 | |
| | | |