aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix http retry timeoutMaximilian Hils2018-04-052-52/+27
| | | | this fixes #3038
* Merge pull request #3032 from mitmproxy/requires-io-masterAldo Cortesi2018-04-051-1/+1
|\ | | | | [requires.io] dependency update on master branch
| * [requires.io] dependency updaterequires.io2018-04-021-1/+1
| |
* | Merge pull request #3029 from cortesi/eventloopAldo Cortesi2018-04-0416-224/+170
|\ \ | | | | | | shift core event loop to asyncio
| * | minor fixesAldo Cortesi2018-04-032-10/+4
| | |
| * | asyncio: factor out test server startup waitAldo Cortesi2018-04-033-12/+7
| | |
| * | asyncio: cleanup and lintAldo Cortesi2018-04-025-6/+10
| | | | | | | | | | | | Also fix a racy websocket test.
| * | asyncio: rebase mitmweb Tornado event loop on asyncioAldo Cortesi2018-04-021-1/+4
| | |
| * | asyncio: test cleanupAldo Cortesi2018-04-025-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 eventloopAldo Cortesi2018-04-022-9/+5
| | |
| * | asyncio: make http2 tests passAldo Cortesi2018-04-023-9/+16
| | |
| * | asyncio: fix a few remaining issues in proxy/test_server.pyAldo Cortesi2018-04-022-9/+14
| | |
| * | asyncio: fix channel interface and testsAldo Cortesi2018-04-014-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 replayAldo Cortesi2018-04-012-23/+3
| | |
| * | asyncio: start a test loop for unit testsAldo Cortesi2018-04-016-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.5Aldo Cortesi2018-04-011-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 acquisitionAldo Cortesi2018-04-012-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 mechanismAldo Cortesi2018-04-0110-140/+159
| |/
* | Merge pull request #3033 from emilstahl/masterThomas Kriechbaumer2018-04-031-1/+1
|\ \ | |/ |/| Fixed --no-mouse parameter message
| * Fixed --no-mouse parameter messageEmil Stahl2018-04-031-1/+1
|/ | | `--no-mouse` is deprecated. Changed parameter to `--set console_mouse=false`
* Update dev.ps1Thomas Kriechbaumer2018-03-311-3/+3
|
* Merge pull request #3025 from Kriechi/py36Aldo Cortesi2018-04-0111-49/+21
|\ | | | | Python 3.5 is dead -- long live Python 3.6!
| * Python 3.5 is dead -- long live Python 3.6!Thomas Kriechbaumer2018-03-3111-49/+21
| | | | | | | | fixes #2266
* | Merge pull request #3026 from ghillu/masterThomas Kriechbaumer2018-03-311-2/+2
|\ \ | |/ |/| Update addons-overview.md
| * Update addons-overview.mdghillu2018-04-011-2/+2
|/ | | Fixed a typo
* Merge pull request #3012 from Kriechi/docs-optionsAldo Cortesi2018-03-3013-65/+126
|\ | | | | docs: add auto-generated options reference
| * docs: add auto-generated options referenceThomas Kriechbaumer2018-03-2513-68/+115
| |
| * docs: add skeleton for options scriptMaximilian Hils2018-03-241-0/+14
| |
* | simplify READMEMaximilian Hils2018-03-281-2/+1
| |
* | fix badgesThomas Kriechbaumer2018-03-271-4/+9
| |
* | fix docs-related URLsThomas Kriechbaumer2018-03-271-3/+3
| |
* | Merge pull request #3014 from MikeShi42/patch-1Thomas Kriechbaumer2018-03-271-1/+1
|\ \ | | | | | | Fixed Typo in Transparent Proxy Setup for Mac
| * | Fixed Typo in Transparent Proxy Setup for MacMichael Shi2018-03-261-1/+1
|/ / | | | | Fixed typo referencing `en2` when it should mention `en0`
* | Merge pull request #3010 from Kriechi/bump-tornadoThomas Kriechbaumer2018-03-242-1/+5
|\ \ | | | | | | fix Tornado 5.0 event loop
| * | fix Tornado 5.0 event loopThomas Kriechbaumer2018-03-242-1/+5
|/ / | | | | | | https://github.com/tornadoweb/tornado/issues/2183#issuecomment-371001254
* | [requires.io] dependency update on master branch (#2992)Thomas Kriechbaumer2018-03-241-2/+2
| |
* | Merge pull request #3008 from mhils/issue-2969Maximilian Hils2018-03-234-12/+18
|\ \ | |/ |/| Don't crash if server address is unknown, fix #2969
| * don't crash if server address is unknown, fix #2969Maximilian Hils2018-03-234-12/+18
|/
* fix cloudfront invalidation pathsMaximilian Hils2018-03-213-3/+3
|
* Merge pull request #3004 from mhils/docs-improvementsMaximilian Hils2018-03-2122-174/+250
|\ | | | | Docs Improvements
| * various docs improvementsMaximilian Hils2018-03-2115-96/+141
| | | | | | | | | | | | | | - add clickable anchors for headers - add "outdated" warning for archived docs - add "edit on github" button - beautify template
| * improve transparent mode docsMaximilian Hils2018-03-201-80/+75
| |
| * minor docs fixesMaximilian Hils2018-03-203-36/+43
| |
| * add google analyticsMaximilian Hils2018-03-202-0/+2
| |
| * abort doc scripts on errorMaximilian Hils2018-03-205-1/+6
| |
| * add README for docs installMaximilian Hils2018-03-201-0/+22
| |
* | update mitmweb dev instructionsMaximilian Hils2018-03-202-6/+6
|/
* Merge pull request #2995 from cortesi/benchAldo Cortesi2018-03-196-0/+93
|\ | | | | bench: Add some very simple manual benchmarking helpers
| * bench: Add some very simple manual benchmarking helpersAldo Cortesi2018-03-176-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-2953Maximilian Hils2018-03-181-3/+1
|\ \ | | | | | | Remove Highlight from status bar