Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | asyncio: fix exit behavior for console | Aldo Cortesi | 2018-04-17 | 2 | -24/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a master.run_loop function. This encapsulates our run behaviour so that it can be used by implementations that need to manage their own run loop (like urwid). - Shift crash exit message to the common core. I'm not convinced we really need this, but if we want it it should be centralised. - Clean up an extra exception that can be thrown by asyncio itself on "dirty" termination after a mitmproxy crash. | |||||
* | | | Merge pull request #3063 from cortesi/sigs | Aldo Cortesi | 2018-04-17 | 2 | -17/+22 | |
|\| | | | | | | | | Ignore signal errors on windows + various fixes | |||||
| * | | Ignore signal errors on windows + various fixes | Aldo Cortesi | 2018-04-17 | 2 | -17/+22 | |
|/ / | | | | | | | | | | | | | | | - Ignore the NotImplementedError raised by add_signal_handler on Windows. - Entrypoints return an integer exit code, or None. Adjust our type annotations and code to suit. Fixes #3061 | |||||
* | | Merge pull request #3048 from cortesi/qbench | Aldo Cortesi | 2018-04-17 | 19 | -51438/+112 | |
|\ \ | |/ |/| | Improve benchmarking | |||||
| * | asyncio: clarify shutdown semantics | Aldo Cortesi | 2018-04-16 | 6 | -27/+29 | |
| | | | | | | | | | | This patch clarifies proxy shutdown, and specifies that the master.shutdown() method is thread-save. | |||||
| * | Clean up test/helper_tools directory | Aldo Cortesi | 2018-04-16 | 5 | -51323/+0 | |
| | | ||||||
| * | Improve benchmarking | Aldo Cortesi | 2018-04-16 | 9 | -93/+88 | |
|/ | | | | | | | | | - The benchmark addon now manages setting up and tearing down the backend and traffic processes itself. - Use wrk instead of hey. I get more consistent results with this tool, and hey shows a strange tail-latency bump that seems artificial. - Make termination behaviour simpler. The bencmark revealed a bug where .done events were not called if the proxy was shut down by an addon. | |||||
* | Merge pull request #3059 from obscure76/enh/issue-3053 | Aldo Cortesi | 2018-04-16 | 60 | -149/+149 | |
|\ | | | | | fix Python 3.6 variable type annotations #3053 | |||||
| * | fix Python 3.6 variable type annotations #3053 | oscure76 | 2018-04-14 | 60 | -149/+149 | |
| | | ||||||
* | | Merge pull request #3050 from kira0204/error-script | Aldo Cortesi | 2018-04-15 | 3 | -10/+29 | |
|\ \ | | | | | | | Handling user script's exceptions, fix #2839 | |||||
| * | | Handling user script exceptions, fix #2839 | kira0204 | 2018-04-10 | 3 | -10/+29 | |
| | | | ||||||
* | | | Merge pull request #3057 from mitmproxy/requires-io-master | Aldo Cortesi | 2018-04-15 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | [requires.io] dependency update on master branch | |||||
| * | | | [requires.io] dependency update | requires.io | 2018-04-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | [requires.io] dependency update | requires.io | 2018-04-14 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #3056 from cortesi/readfile | Aldo Cortesi | 2018-04-15 | 4 | -54/+99 | |
|\ \ \ | |/ / |/| | | readfile fixes | |||||
| * | | mitmdump: also set dumper_filter to default filter on startup | Aldo Cortesi | 2018-04-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | Fixes #3051 | |||||
| * | | readfile: add a readfile_filter option | Aldo Cortesi | 2018-04-14 | 4 | -40/+81 | |
| | | | | | | | | | | | | | | | | | | * Add a readfile_filter option that filters flows on read. * Adjust test suite for asyncio. * Add asynctest as a dev dependency. | |||||
| * | | asyncio: adjust readfile.py addon for async | Aldo Cortesi | 2018-04-14 | 2 | -14/+17 | |
| | | | ||||||
* | | | 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 | |
| | | | |