Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix Python 3.6 variable type annotations #3053 | oscure76 | 2018-04-14 | 60 | -149/+149 |
| | |||||
* | Merge pull request #3054 from Kriechi/fix-example | Aldo Cortesi | 2018-04-14 | 1 | -1/+1 |
|\ | | | | | fix example filename | ||||
| * | fix example filename | Thomas Kriechbaumer | 2018-04-13 | 1 | -1/+1 |
|/ | |||||
* | fix GA id | Maximilian Hils | 2018-04-11 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3035 from cortesi/aiosimpler | Aldo Cortesi | 2018-04-07 | 35 | -295/+285 |
|\ | | | | | asyncio consolidation | ||||
| * | asyncio: ditch the handler context | Aldo Cortesi | 2018-04-07 | 7 | -54/+21 |
| | | | | | | | | | | | | | | There are a few reasons for this. First, logs are now async, and can be called at any time. Second, the event loop is thread local, so there can only ever be one master per thread. These two things together completely obviate the need for a handler context. | ||||
| * | asyncio: remove master.add_log, in favor of a persistent log.Log instance | Aldo Cortesi | 2018-04-07 | 6 | -25/+12 |
| | | |||||
| * | asyncio: remove test master.has_log | Aldo Cortesi | 2018-04-07 | 7 | -30/+40 |
| | | | | | | | | | | Now that logs are async, using this call is almost always a mistake. Signal this by making it semi-private. The method may go away entirely down the track. | ||||
| * | asyncio: move log mechanism onto the event loop | Aldo Cortesi | 2018-04-07 | 21 | -94/+128 |
| | | | | | | | | | | | | Logs are now asynchronous, with a log entry pushed onto the event loop for handling. To support this, the test mechanism grows an await_log method that waits for a log entry to appear. | ||||
| * | asyncio simplify: we don't need a queue for proxy->main loop comms | Aldo Cortesi | 2018-04-07 | 13 | -85/+83 |
| | | | | | | | | Instead, we just schedule coroutines directly onto the core loop. | ||||
| * | asyncio: remove last vestiage of channel input from master | Aldo Cortesi | 2018-04-07 | 3 | -17/+11 |
|/ | |||||
* | Merge pull request #3031 from itzikBraun/add-httpie-export | Aldo Cortesi | 2018-04-06 | 2 | -4/+52 |
|\ | | | | | added option to export request as httpie command | ||||
| * | added option to export request as httpie command | itzikBraun | 2018-04-02 | 2 | -4/+52 |
| | | |||||
* | | Merge pull request #2971 from kira0204/user-script-exception | Aldo Cortesi | 2018-04-06 | 2 | -6/+38 |
|\ \ | | | | | | | A unified handler for user's scripts exception | ||||
| * | | use error handler function | kira0204 | 2018-03-26 | 2 | -7/+7 |
| | | | |||||
| * | | User script exception handler[squash] | kira0204 | 2018-03-07 | 2 | -0/+32 |
| | | | | | | | | | | | | | | | | | | fixing 2837, added test unified-function deleting the wrong commit | ||||
* | | | Merge pull request #3046 from cortesi/backlog | Aldo Cortesi | 2018-04-06 | 1 | -2/+1 |
|\ \ \ | | | | | | | | | Remove socket listen backlog constraint | ||||
| * | | | Remove socket listen backlog constraint | Aldo Cortesi | 2018-04-06 | 1 | -2/+1 |
|/ / / | | | | | | | | | | | | | | | | I have no idea why we did this, but the default value is 128, and setting it this low drops connections under conditions our users can reasonably be expeted to reach. | ||||
* | | | update release instructions | Maximilian Hils | 2018-04-05 | 1 | -0/+5 |
| | | | |||||
* | | | update CHANGELOG | Maximilian Hils | 2018-04-05 | 1 | -2/+14 |
| | | | |||||
* | | | Merge pull request #3044 from mhils/issue-3038 | Maximilian Hils | 2018-04-05 | 2 | -52/+27 |
|\ \ \ | | | | | | | | | fix http retry timeout | ||||
| * | | | 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 |
| | | |