aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3082 from p1uymi/patch-2Aldo Cortesi2018-04-271-3/+3
|\
| * Changed syntax from v2 to v3p1uymi2018-04-261-3/+3
* | Merge pull request #3083 from mitmproxy/requires-io-masterAldo Cortesi2018-04-271-1/+1
|\ \ | |/ |/|
| * [requires.io] dependency updaterequires.io2018-04-270-0/+0
| * [requires.io] dependency updaterequires.io2018-04-261-1/+1
|/
* Merge pull request #3078 from kajojify/expanduserAldo Cortesi2018-04-264-5/+10
|\
| * Incompatible typesMiroslav2018-04-261-2/+2
| * LintMiroslav2018-04-261-1/+0
| * Fix #3002. Auto-expandingMiroslav2018-04-264-4/+10
* | Merge pull request #3076 from clyfish/keepaliveAldo Cortesi2018-04-261-0/+2
|\ \
| * | add SO_KEEPALIVECheng Liangyu2018-04-251-0/+2
* | | Merge pull request #3071 from cortesi/ticklessAldo Cortesi2018-04-2643-327/+348
|\ \ \ | |_|/ |/| |
| * | test: shift test_data out of our public APIAldo Cortesi2018-04-2333-229/+216
| * | addons/script: improve relability of reload testAldo Cortesi2018-04-234-7/+13
| * | asyncio: shift script reloading out of the tick eventAldo Cortesi2018-04-2313-105/+133
| |/
* | Merge pull request #3077 from mhils/pytest-fixMaximilian Hils2018-04-253-3/+3
|\ \ | |/ |/|
| * fix pytest invocation errorsMaximilian Hils2018-04-253-3/+3
|/
* Merge pull request #3070 from CorTal/Fix#3066Thomas Kriechbaumer2018-04-181-1/+1
|\
| * call_soon->ensure_futureCorTal2018-04-181-1/+1
|/
* Merge pull request #3069 from cortesi/mwebAldo Cortesi2018-04-183-29/+8
|\
| * mitmweb: don't blort all over my config fileAldo Cortesi2018-04-181-5/+5
| * tcp: As of Python 3.5, EINTR is retried automatically by selectAldo Cortesi2018-04-181-10/+1
| * mitmweb: shift to use new run_loop wrapper on masterAldo Cortesi2018-04-181-14/+2
|/
* Merge pull request #3064 from cortesi/mexitAldo Cortesi2018-04-182-24/+29
|\
| * asyncio: fix exit behavior for consoleAldo Cortesi2018-04-172-24/+29
* | Merge pull request #3063 from cortesi/sigsAldo Cortesi2018-04-172-17/+22
|\|
| * Ignore signal errors on windows + various fixesAldo Cortesi2018-04-172-17/+22
|/
* Merge pull request #3048 from cortesi/qbenchAldo Cortesi2018-04-1719-51438/+112
|\
| * asyncio: clarify shutdown semanticsAldo Cortesi2018-04-166-27/+29
| * Clean up test/helper_tools directoryAldo Cortesi2018-04-165-51323/+0
| * Improve benchmarkingAldo Cortesi2018-04-169-93/+88
|/
* Merge pull request #3059 from obscure76/enh/issue-3053Aldo Cortesi2018-04-1660-149/+149
|\
| * fix Python 3.6 variable type annotations #3053oscure762018-04-1460-149/+149
* | Merge pull request #3050 from kira0204/error-scriptAldo Cortesi2018-04-153-10/+29
|\ \
| * | Handling user script exceptions, fix #2839kira02042018-04-103-10/+29
* | | Merge pull request #3057 from mitmproxy/requires-io-masterAldo Cortesi2018-04-151-2/+2
|\ \ \
| * | | [requires.io] dependency updaterequires.io2018-04-141-1/+1
| * | | [requires.io] dependency updaterequires.io2018-04-141-1/+1
| | |/ | |/|
* | | Merge pull request #3056 from cortesi/readfileAldo Cortesi2018-04-154-54/+99
|\ \ \ | |/ / |/| |
| * | mitmdump: also set dumper_filter to default filter on startupAldo Cortesi2018-04-141-0/+1
| * | readfile: add a readfile_filter optionAldo Cortesi2018-04-144-40/+81
| * | asyncio: adjust readfile.py addon for asyncAldo Cortesi2018-04-142-14/+17
* | | Merge pull request #3054 from Kriechi/fix-exampleAldo Cortesi2018-04-141-1/+1
|\ \ \ | |/ / |/| |
| * | fix example filenameThomas Kriechbaumer2018-04-131-1/+1
|/ /
* / fix GA idMaximilian Hils2018-04-111-1/+1
|/
* Merge pull request #3035 from cortesi/aiosimplerAldo Cortesi2018-04-0735-295/+285
|\
| * asyncio: ditch the handler contextAldo Cortesi2018-04-077-54/+21
| * asyncio: remove master.add_log, in favor of a persistent log.Log instanceAldo Cortesi2018-04-076-25/+12
| * asyncio: remove test master.has_logAldo Cortesi2018-04-077-30/+40
| * asyncio: move log mechanism onto the event loopAldo Cortesi2018-04-0721-94/+128
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 20:41:29 +0000