Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #3076 from clyfish/keepalive | Aldo Cortesi | 2018-04-26 | 1 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | 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 | |
| * | | | | | | asyncio: shift script reloading out of the tick event | Aldo Cortesi | 2018-04-23 | 13 | -105/+133 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #3077 from mhils/pytest-fix | Maximilian Hils | 2018-04-25 | 3 | -3/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | mitmweb: don't blort all over my config file | Aldo Cortesi | 2018-04-18 | 1 | -5/+5 | |
| * | | | | | tcp: As of Python 3.5, EINTR is retried automatically by select | Aldo Cortesi | 2018-04-18 | 1 | -10/+1 | |
| * | | | | | mitmweb: shift to use new run_loop wrapper on master | Aldo Cortesi | 2018-04-18 | 1 | -14/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3064 from cortesi/mexit | Aldo Cortesi | 2018-04-18 | 2 | -24/+29 | |
|\ \ \ \ \ | ||||||
| * | | | | | asyncio: fix exit behavior for console | Aldo Cortesi | 2018-04-17 | 2 | -24/+29 | |
* | | | | | | Merge pull request #3063 from cortesi/sigs | Aldo Cortesi | 2018-04-17 | 2 | -17/+22 | |
|\| | | | | | ||||||
| * | | | | | Ignore signal errors on windows + various fixes | Aldo Cortesi | 2018-04-17 | 2 | -17/+22 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3048 from cortesi/qbench | Aldo Cortesi | 2018-04-17 | 19 | -51438/+112 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | asyncio: clarify shutdown semantics | Aldo Cortesi | 2018-04-16 | 6 | -27/+29 | |
| * | | | | Clean up test/helper_tools directory | Aldo Cortesi | 2018-04-16 | 5 | -51323/+0 | |
| * | | | | Improve benchmarking | Aldo Cortesi | 2018-04-16 | 9 | -93/+88 | |
|/ / / / | ||||||
* | | | | 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 | 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 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 | 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 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | mitmdump: also set dumper_filter to default filter on startup | Aldo Cortesi | 2018-04-14 | 1 | -0/+1 | |
| * | | | | | readfile: add a readfile_filter option | Aldo Cortesi | 2018-04-14 | 4 | -40/+81 | |
| * | | | | | 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 | 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: ditch the handler context | Aldo Cortesi | 2018-04-07 | 7 | -54/+21 | |
| * | | | | 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 | |
| * | | | | asyncio: move log mechanism onto the event loop | Aldo Cortesi | 2018-04-07 | 21 | -94/+128 | |
| * | | | | asyncio simplify: we don't need a queue for proxy->main loop comms | Aldo Cortesi | 2018-04-07 | 13 | -85/+83 | |
| * | | | | 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 | itzikBraun | 2018-04-02 | 2 | -4/+52 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #2971 from kira0204/user-script-exception | Aldo Cortesi | 2018-04-06 | 2 | -6/+38 | |
|\ \ \ \ | ||||||
| * | | | | use error handler function | kira0204 | 2018-03-26 | 2 | -7/+7 | |
| * | | | | User script exception handler[squash] | kira0204 | 2018-03-07 | 2 | -0/+32 | |
* | | | | | Merge pull request #3046 from cortesi/backlog | Aldo Cortesi | 2018-04-06 | 1 | -2/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove socket listen backlog constraint | Aldo Cortesi | 2018-04-06 | 1 | -2/+1 | |
|/ / / / / |