Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix http retry timeout | Maximilian Hils | 2018-04-05 | 2 | -52/+27 |
| | | | | this fixes #3038 | ||||
* | Merge pull request #3032 from mitmproxy/requires-io-master | Aldo Cortesi | 2018-04-05 | 1 | -1/+1 |
|\ | | | | | [requires.io] dependency update on master branch | ||||
| * | [requires.io] dependency update | requires.io | 2018-04-02 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3029 from cortesi/eventloop | Aldo Cortesi | 2018-04-04 | 16 | -224/+170 |
|\ \ | | | | | | | shift core event loop to asyncio | ||||
| * | | minor fixes | Aldo Cortesi | 2018-04-03 | 2 | -10/+4 |
| | | | |||||
| * | | asyncio: factor out test server startup wait | Aldo Cortesi | 2018-04-03 | 3 | -12/+7 |
| | | | |||||
| * | | asyncio: cleanup and lint | Aldo Cortesi | 2018-04-02 | 5 | -6/+10 |
| | | | | | | | | | | | | Also fix a racy websocket test. | ||||
| * | | asyncio: rebase mitmweb Tornado event loop on asyncio | Aldo Cortesi | 2018-04-02 | 1 | -1/+4 |
| | | | |||||
| * | | asyncio: test cleanup | Aldo Cortesi | 2018-04-02 | 5 | -8/+27 |
| | | | | | | | | | | | | | | | | | | Also silence asyncio logs. We sometimes end up with messages on the queue that need to be ignored when the proxy shuts down, and asyncio complains loudly about this. | ||||
| * | | asyncio: shift console over to asyncio eventloop | Aldo Cortesi | 2018-04-02 | 2 | -9/+5 |
| | | | |||||
| * | | asyncio: make http2 tests pass | Aldo Cortesi | 2018-04-02 | 3 | -9/+16 |
| | | | |||||
| * | | asyncio: fix a few remaining issues in proxy/test_server.py | Aldo Cortesi | 2018-04-02 | 2 | -9/+14 |
| | | | |||||
| * | | asyncio: fix channel interface and tests | Aldo Cortesi | 2018-04-01 | 4 | -24/+33 |
| | | | | | | | | | | | | | | | We now need to synthesize a tick event when changing addons in tests, because tick is asynchronously called on the event loop. | ||||
| * | | asyncio: fix client replay | Aldo Cortesi | 2018-04-01 | 2 | -23/+3 |
| | | | |||||
| * | | asyncio: start a test loop for unit tests | Aldo Cortesi | 2018-04-01 | 6 | -17/+9 |
| | | | | | | | | | | | | | | | Also move signal handling out of master. These only work in the main thread, and properly belong in main.py. | ||||
| * | | Remove support for Python 3.5 | Aldo Cortesi | 2018-04-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a number of significant improvements in Python3.6 - especially in asyncio - that makes ditching Python 3.5 compelling. The next Ubuntu LTS will be released before the next version of mitmproxy, and will include Python 3.6 in base. This patch removes support for testing under Python 3.5 and changes our documentation. There are deeper changes in the type system and so forth that we will make over time. | ||||
| * | | asyncio: clean up event loop acquisition | Aldo Cortesi | 2018-04-01 | 2 | -97/+20 |
| | | | | | | | | | | | | | | | | | | | | | We now acquire the event loop through asyncio.get_event_loop, avoiding having to pass the loop explicity in a bunch of places. This function does not return the currently running loop from within coroutines in versions of Python prior to 3.6. | ||||
| * | | asyncio: brutally rip out our old queue mechanism | Aldo Cortesi | 2018-04-01 | 10 | -140/+159 |
| |/ | |||||
* | | Merge pull request #3033 from emilstahl/master | Thomas Kriechbaumer | 2018-04-03 | 1 | -1/+1 |
|\ \ | |/ |/| | Fixed --no-mouse parameter message | ||||
| * | Fixed --no-mouse parameter message | Emil Stahl | 2018-04-03 | 1 | -1/+1 |
|/ | | | `--no-mouse` is deprecated. Changed parameter to `--set console_mouse=false` | ||||
* | Update dev.ps1 | Thomas Kriechbaumer | 2018-03-31 | 1 | -3/+3 |
| | |||||
* | Merge pull request #3025 from Kriechi/py36 | Aldo Cortesi | 2018-04-01 | 11 | -49/+21 |
|\ | | | | | Python 3.5 is dead -- long live Python 3.6! | ||||
| * | Python 3.5 is dead -- long live Python 3.6! | Thomas Kriechbaumer | 2018-03-31 | 11 | -49/+21 |
| | | | | | | | | fixes #2266 | ||||
* | | Merge pull request #3026 from ghillu/master | Thomas Kriechbaumer | 2018-03-31 | 1 | -2/+2 |
|\ \ | |/ |/| | Update addons-overview.md | ||||
| * | Update addons-overview.md | ghillu | 2018-04-01 | 1 | -2/+2 |
|/ | | | Fixed a typo | ||||
* | Merge pull request #3012 from Kriechi/docs-options | Aldo Cortesi | 2018-03-30 | 13 | -65/+126 |
|\ | | | | | docs: add auto-generated options reference | ||||
| * | docs: add auto-generated options reference | Thomas Kriechbaumer | 2018-03-25 | 13 | -68/+115 |
| | | |||||
| * | docs: add skeleton for options script | Maximilian Hils | 2018-03-24 | 1 | -0/+14 |
| | | |||||
* | | simplify README | Maximilian Hils | 2018-03-28 | 1 | -2/+1 |
| | | |||||
* | | fix badges | Thomas Kriechbaumer | 2018-03-27 | 1 | -4/+9 |
| | | |||||
* | | fix docs-related URLs | Thomas Kriechbaumer | 2018-03-27 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #3014 from MikeShi42/patch-1 | Thomas Kriechbaumer | 2018-03-27 | 1 | -1/+1 |
|\ \ | | | | | | | Fixed Typo in Transparent Proxy Setup for Mac | ||||
| * | | Fixed Typo in Transparent Proxy Setup for Mac | Michael Shi | 2018-03-26 | 1 | -1/+1 |
|/ / | | | | | Fixed typo referencing `en2` when it should mention `en0` | ||||
* | | Merge pull request #3010 from Kriechi/bump-tornado | Thomas Kriechbaumer | 2018-03-24 | 2 | -1/+5 |
|\ \ | | | | | | | fix Tornado 5.0 event loop | ||||
| * | | fix Tornado 5.0 event loop | Thomas Kriechbaumer | 2018-03-24 | 2 | -1/+5 |
|/ / | | | | | | | https://github.com/tornadoweb/tornado/issues/2183#issuecomment-371001254 | ||||
* | | [requires.io] dependency update on master branch (#2992) | Thomas Kriechbaumer | 2018-03-24 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #3008 from mhils/issue-2969 | Maximilian Hils | 2018-03-23 | 4 | -12/+18 |
|\ \ | |/ |/| | Don't crash if server address is unknown, fix #2969 | ||||
| * | don't crash if server address is unknown, fix #2969 | Maximilian Hils | 2018-03-23 | 4 | -12/+18 |
|/ | |||||
* | fix cloudfront invalidation paths | Maximilian Hils | 2018-03-21 | 3 | -3/+3 |
| | |||||
* | Merge pull request #3004 from mhils/docs-improvements | Maximilian Hils | 2018-03-21 | 22 | -174/+250 |
|\ | | | | | Docs Improvements | ||||
| * | various docs improvements | Maximilian Hils | 2018-03-21 | 15 | -96/+141 |
| | | | | | | | | | | | | | | - add clickable anchors for headers - add "outdated" warning for archived docs - add "edit on github" button - beautify template | ||||
| * | improve transparent mode docs | Maximilian Hils | 2018-03-20 | 1 | -80/+75 |
| | | |||||
| * | minor docs fixes | Maximilian Hils | 2018-03-20 | 3 | -36/+43 |
| | | |||||
| * | add google analytics | Maximilian Hils | 2018-03-20 | 2 | -0/+2 |
| | | |||||
| * | abort doc scripts on error | Maximilian Hils | 2018-03-20 | 5 | -1/+6 |
| | | |||||
| * | add README for docs install | Maximilian Hils | 2018-03-20 | 1 | -0/+22 |
| | | |||||
* | | update mitmweb dev instructions | Maximilian Hils | 2018-03-20 | 2 | -6/+6 |
|/ | |||||
* | Merge pull request #2995 from cortesi/bench | Aldo Cortesi | 2018-03-19 | 6 | -0/+93 |
|\ | | | | | bench: Add some very simple manual benchmarking helpers | ||||
| * | bench: Add some very simple manual benchmarking helpers | Aldo Cortesi | 2018-03-17 | 6 | -0/+93 |
| | | | | | | | | | | This includes a profiler addon that we might consider for promotion to a builtin down the track. | ||||
* | | Merge pull request #2999 from fenilgandhi/Fix-2953 | Maximilian Hils | 2018-03-18 | 1 | -3/+1 |
|\ \ | | | | | | | Remove Highlight from status bar |