Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3082 from p1uymi/patch-2 | Aldo Cortesi | 2018-04-27 | 1 | -3/+3 |
|\ | | | | | Changed syntax of two options (from v2 to v3) | ||||
| * | Changed syntax from v2 to v3 | p1uymi | 2018-04-26 | 1 | -3/+3 |
| | | | | | | | | --client-certs = v2 syntax --> --set client_certs=value = v3 syntax --cadir = v2 syntax --> --set cadir=value = v3 syntax | ||||
* | | Merge pull request #3083 from mitmproxy/requires-io-master | Aldo Cortesi | 2018-04-27 | 1 | -1/+1 |
|\ \ | |/ |/| | [requires.io] dependency update on master branch | ||||
| * | [requires.io] dependency update | requires.io | 2018-04-27 | 0 | -0/+0 |
| | | |||||
| * | [requires.io] dependency update | requires.io | 2018-04-26 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3078 from kajojify/expanduser | Aldo Cortesi | 2018-04-26 | 4 | -5/+10 |
|\ | | | | | Fix #3002. Auto-expanding for tilda. | ||||
| * | Incompatible types | Miroslav | 2018-04-26 | 1 | -2/+2 |
| | | |||||
| * | Lint | Miroslav | 2018-04-26 | 1 | -1/+0 |
| | | |||||
| * | Fix #3002. Auto-expanding | Miroslav | 2018-04-26 | 4 | -4/+10 |
| | | |||||
* | | Merge pull request #3076 from clyfish/keepalive | Aldo Cortesi | 2018-04-26 | 1 | -0/+2 |
|\ \ | | | | | | | add SO_KEEPALIVE | ||||
| * | | add SO_KEEPALIVE | Cheng Liangyu | 2018-04-25 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #3071 from cortesi/tickless | Aldo Cortesi | 2018-04-26 | 43 | -327/+348 |
|\ \ \ | |_|/ |/| | | asyncio: shift script reloading out of the tick event | ||||
| * | | test: shift test_data out of our public API | Aldo Cortesi | 2018-04-23 | 33 | -229/+216 |
| | | | |||||
| * | | addons/script: improve relability of reload test | Aldo Cortesi | 2018-04-23 | 4 | -7/+13 |
| | | | | | | | | | | | | | | | | | | The granularity of mtime is surprisingly bad. Make the tests more robust against this, and promote has_log back to a public method, now that we have a few legitimate examples. | ||||
| * | | asyncio: shift script reloading out of the tick event | Aldo Cortesi | 2018-04-23 | 13 | -105/+133 |
| |/ | | | | | | | | | | | | | The tick event is a nasty compromise, left over from when we didn't have an event loop. This is the first patch in a series that explores moving our built-in addons to managing coroutines on the eventloop directly for periodic tasks. | ||||
* | | Merge pull request #3077 from mhils/pytest-fix | Maximilian Hils | 2018-04-25 | 3 | -3/+3 |
|\ \ | |/ |/| | Fix pytest invocation errors | ||||
| * | fix pytest invocation errors | Maximilian Hils | 2018-04-25 | 3 | -3/+3 |
|/ | |||||
* | Merge pull request #3070 from CorTal/Fix#3066 | Thomas Kriechbaumer | 2018-04-18 | 1 | -1/+1 |
|\ | | | | | Fix asyncio.call_soon -> asyncio.ensure_future | ||||
| * | call_soon->ensure_future | CorTal | 2018-04-18 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3069 from cortesi/mweb | Aldo Cortesi | 2018-04-18 | 3 | -29/+8 |
|\ | | | | | A grab-bag of mitmweb-related fixes | ||||
| * | mitmweb: don't blort all over my config file | Aldo Cortesi | 2018-04-18 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | Temporarily disable config saving until we can look at this more closely. Config saving should: - Only happen when explicitly requested by the user - Only save changed values | ||||
| * | tcp: As of Python 3.5, EINTR is retried automatically by select | Aldo Cortesi | 2018-04-18 | 1 | -10/+1 |
| | | | | | | | | See https://www.python.org/dev/peps/pep-0475/ | ||||
| * | mitmweb: shift to use new run_loop wrapper on master | Aldo Cortesi | 2018-04-18 | 1 | -14/+2 |
|/ | | | | Fixes #3067 | ||||
* | Merge pull request #3064 from cortesi/mexit | Aldo Cortesi | 2018-04-18 | 2 | -24/+29 |
|\ | | | | | asyncio: fix exit behaviour for console | ||||
| * | 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. |