Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | fix debug mode on Windows | Maximilian Hils | 2016-06-13 | 2 | -3/+9 | |
| |/ | ||||||
* | | Merge pull request #1251 from cortesi/netlibrace | Aldo Cortesi | 2016-06-14 | 6 | -324/+337 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into netlibrace | Aldo Cortesi | 2016-06-14 | 16 | -34/+63 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1254 from mitmproxy/scriptargs | Aldo Cortesi | 2016-06-14 | 16 | -34/+63 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Don't fail when start() is not defined | Aldo Cortesi | 2016-06-14 | 1 | -1/+1 | |
| * | | update examples, tests, docs | Maximilian Hils | 2016-06-13 | 15 | -32/+39 | |
| * | | fix contextmanager, remove args argument to start() | Maximilian Hils | 2016-06-13 | 1 | -3/+15 | |
| * | | A tiny wrapper to make script invocations nicer | Aldo Cortesi | 2016-06-14 | 1 | -1/+11 | |
|/ / | ||||||
| * | Fix Python3 tests | Aldo Cortesi | 2016-06-14 | 1 | -1/+1 | |
| * | Merge branch 'netlibrace' of github.com:cortesi/mitmproxy into netlibrace | Aldo Cortesi | 2016-06-14 | 0 | -0/+0 | |
| |\ | ||||||
| | * | Use handlers in http2 test suite | Aldo Cortesi | 2016-06-14 | 1 | -100/+100 | |
| | * | Merge remote-tracking branch 'upstream/master' into netlibrace | Aldo Cortesi | 2016-06-14 | 1 | -55/+83 | |
| | |\ | |_|/ |/| | | ||||||
| | * | Start rolling out leak detection in netlib | Aldo Cortesi | 2016-06-12 | 5 | -224/+237 | |
| * | | Satisfy lint | Aldo Cortesi | 2016-06-14 | 1 | -1/+1 | |
| * | | Use handlers in http2 test suite | Aldo Cortesi | 2016-06-14 | 1 | -100/+100 | |
| * | | Start rolling out leak detection in netlib | Aldo Cortesi | 2016-06-14 | 5 | -224/+237 | |
|/ / | ||||||
* | | Merge pull request #1242 from Kriechi/fix-1240 | Thomas Kriechbaumer | 2016-06-12 | 1 | -55/+83 | |
|\ \ | |/ |/| | ||||||
| * | fix #1240 | Thomas Kriechbaumer | 2016-06-12 | 1 | -55/+83 | |
|/ | ||||||
* | Merge pull request #1247 from cortesi/appveyor | Aldo Cortesi | 2016-06-12 | 3 | -43/+62 | |
|\ | ||||||
| * | Merge branch 'master' into appveyor | Aldo Cortesi | 2016-06-12 | 16 | -51/+34 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #1246 from cortesi/version | Aldo Cortesi | 2016-06-12 | 16 | -51/+34 | |
|\ \ | ||||||
| * | | Fold mitmproxy.version and pathod.version into netlib.version | Aldo Cortesi | 2016-06-12 | 16 | -51/+34 | |
|/ / | ||||||
| * | Make the tcp connection closer cancellable | Aldo Cortesi | 2016-06-12 | 2 | -42/+55 | |
| * | Be stricter about handling connetcts in the pathoc test suite | Aldo Cortesi | 2016-06-12 | 1 | -1/+7 | |
|/ | ||||||
* | Merge pull request #1243 from cortesi/debug2 | Thomas Kriechbaumer | 2016-06-11 | 3 | -2/+26 | |
|\ | ||||||
| * | Satisfy lint | Aldo Cortesi | 2016-06-11 | 1 | -1/+5 | |
| * | debug: On SIGUSR2, we dump tracebacks for all threads to screen | Aldo Cortesi | 2016-06-11 | 3 | -2/+22 | |
|/ | ||||||
* | Merge pull request #1241 from cortesi/debug | Aldo Cortesi | 2016-06-11 | 13 | -46/+183 | |
|\ | ||||||
| * | Zap stray semicolon | Aldo Cortesi | 2016-06-11 | 1 | -1/+1 | |
| * | debug: num_fds is posix-only | Aldo Cortesi | 2016-06-11 | 1 | -1/+2 | |
| * | debug: add OpenSSL | Aldo Cortesi | 2016-06-11 | 1 | -0/+3 | |
| * | debug: verison -> version | Aldo Cortesi | 2016-06-11 | 1 | -1/+1 | |
| * | Improve debugging of thread and other leaks | Aldo Cortesi | 2016-06-11 | 12 | -50/+138 | |
| * | debug.sysinfo: tests and coverage | Aldo Cortesi | 2016-06-11 | 2 | -6/+15 | |
| * | Add a --sysinfo flag to all daemons | Aldo Cortesi | 2016-06-11 | 3 | -8/+44 | |
|/ | ||||||
* | Merge pull request #1238 from cortesi/toxfiddle | Aldo Cortesi | 2016-06-11 | 2 | -8/+20 | |
|\ | ||||||
| * | Merge branch 'master' into toxfiddle | Aldo Cortesi | 2016-06-11 | 26 | -1036/+1103 | |
| |\ | |/ |/| | ||||||
* | | Merge remote-tracking branch 'jason/master' | Maximilian Hils | 2016-06-10 | 26 | -1036/+1103 | |
|\ \ | ||||||
| * | | [web] update build | Jason | 2016-06-09 | 3 | -61562/+493 | |
| * | | [web] header.js -> Header.js | Jason | 2016-06-09 | 14 | -988/+62122 | |
| * | | [web] eventlog.js -> EventLog.jsx | Jason | 2016-06-09 | 6 | -191/+182 | |
| * | | [web] footer.js -> Footer.jsx | Jason | 2016-06-09 | 3 | -41/+38 | |
| * | | [web] fix shortcut for header fields | Jason | 2016-06-09 | 3 | -2/+3 | |
| * | | [web] separate flowtable to multiple files | Jason | 2016-06-09 | 13 | -394/+407 | |
| | * | tox: Pull Py3 test list out into an environment variable | Aldo Cortesi | 2016-06-11 | 1 | -2/+4 | |
| | * | We're not using tox-travis any more - ditch it. | Aldo Cortesi | 2016-06-10 | 1 | -1/+1 | |
| | * | Remove explicit versions in tox CI environments | Aldo Cortesi | 2016-06-10 | 1 | -2/+0 | |
| | * | Distinguish between CI and interactive versions of tox | Aldo Cortesi | 2016-06-10 | 2 | -7/+19 | |
| |/ |/| | ||||||
* | | Fix a crash when pathoc connections fail | Aldo Cortesi | 2016-06-10 | 2 | -66/+62 | |
* | | Merge remote-tracking branch 'upstream/master' into pathodlog | Aldo Cortesi | 2016-06-10 | 11 | -61673/+1037 | |
|\| |