aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3093 from cortesi/diecustomAldo Cortesi2018-05-052-16/+21
|\
| * Remove custom eventsAldo Cortesi2018-05-032-16/+21
* | Merge pull request #3097 from cortesi/exampAldo Cortesi2018-05-052-4/+11
|\ \
| * | Revamp dup_and_replay exampleAldo Cortesi2018-05-052-4/+11
* | | Merge pull request #3091 from cortesi/dietickAldo Cortesi2018-05-038-48/+16
|\ \ \ | |/ / |/| / | |/
| * Remove the tick eventAldo Cortesi2018-05-028-48/+16
* | Merge pull request #3090 from cortesi/iflightAldo Cortesi2018-05-0216-62/+99
|\|
| * Catch some stray command.call invocationsAldo Cortesi2018-05-022-4/+4
| * taddons: remove has_eventAldo Cortesi2018-05-022-12/+0
| * Redesign keepservingAldo Cortesi2018-05-029-40/+78
| * console: use replay count commands in statusbarAldo Cortesi2018-05-022-4/+9
| * server replay: expose the replay.server.count commandAldo Cortesi2018-05-021-0/+1
| * client replay: replaying flows in-flight should be added to count()Aldo Cortesi2018-05-022-2/+7
* | Merge pull request #3089 from cortesi/creplayAldo Cortesi2018-05-0222-411/+386
|\|
| * commands: clarify command call interface, fix web app replayAldo Cortesi2018-05-028-35/+40
| * client replay: use count command for console statusbarAldo Cortesi2018-05-011-3/+4
| * client replay: expad and consolidate testsAldo Cortesi2018-05-014-97/+128
| * client replay: revert our changes if replay is abortedAldo Cortesi2018-04-301-0/+2
| * client replay: re-designAldo Cortesi2018-04-308-209/+154
| * client replay: move all client replay-related code into addonAldo Cortesi2018-04-279-269/+260
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-07 11:31:14 +0000