aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1243 from cortesi/debug2Thomas Kriechbaumer2016-06-113-2/+26
|\ | | | | debug: On SIGUSR2, we dump tracebacks for all threads to screen
| * Satisfy lintAldo Cortesi2016-06-111-1/+5
| |
| * debug: On SIGUSR2, we dump tracebacks for all threads to screenAldo Cortesi2016-06-113-2/+22
|/
* Merge pull request #1241 from cortesi/debugAldo Cortesi2016-06-1113-46/+183
|\ | | | | Debug
| * Zap stray semicolonAldo Cortesi2016-06-111-1/+1
| |
| * debug: num_fds is posix-onlyAldo Cortesi2016-06-111-1/+2
| |
| * debug: add OpenSSLAldo Cortesi2016-06-111-0/+3
| |
| * debug: verison -> versionAldo Cortesi2016-06-111-1/+1
| | | | | | | | @resam blew our sponsorship - t-mobile is up next
| * Improve debugging of thread and other leaksAldo Cortesi2016-06-1112-50/+138
| | | | | | | | | | | | | | - Add basethread.BaseThread that all threads outside of test suites should use - Add a signal handler to mitmproxy, mitmdump and mitmweb that dumps resource information to screen when SIGUSR1 is received. - Improve thread naming throughout to make thread dumps understandable
| * debug.sysinfo: tests and coverageAldo Cortesi2016-06-112-6/+15
| |
| * Add a --sysinfo flag to all daemonsAldo Cortesi2016-06-113-8/+44
|/ | | | | This dumps all the platform information and mitmproxy version data we'd normally need to troubleshoot an issue.
* Merge pull request #1238 from cortesi/toxfiddleAldo Cortesi2016-06-112-8/+20
|\ | | | | Distinguish between CI and interactive versions of tox
| * Merge branch 'master' into toxfiddleAldo Cortesi2016-06-1126-1036/+1103
| |\ | |/ |/|
* | Merge remote-tracking branch 'jason/master'Maximilian Hils2016-06-1026-1036/+1103
|\ \
| * | [web] update buildJason2016-06-093-61562/+493
| | |
| * | [web] header.js -> Header.jsJason2016-06-0914-988/+62122
| | |
| * | [web] eventlog.js -> EventLog.jsxJason2016-06-096-191/+182
| | |
| * | [web] footer.js -> Footer.jsxJason2016-06-093-41/+38
| | |
| * | [web] fix shortcut for header fieldsJason2016-06-093-2/+3
| | |
| * | [web] separate flowtable to multiple filesJason2016-06-0913-394/+407
| | |
| | * tox: Pull Py3 test list out into an environment variableAldo Cortesi2016-06-111-2/+4
| | | | | | | | | | | | Suggestion from @resam
| | * We're not using tox-travis any more - ditch it.Aldo Cortesi2016-06-101-1/+1
| | |
| | * Remove explicit versions in tox CI environmentsAldo Cortesi2016-06-101-2/+0
| | | | | | | | | | | | | | | Tox matches the environment prefix against its std environs, so we don't need to be explicit with versions here.
| | * Distinguish between CI and interactive versions of toxAldo Cortesi2016-06-102-7/+19
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | - This patch changes tox so that local invocation runs the tests with paralellism, coverage disabled, and without attempting to report coverage upstream. - You can now run specific tests for the py27 environment: tox -e py27 ./path/to/my/test We can't do this for py35 just yet, because of our junk filter, and the fact that we specify which tests to run directly in the conf file. Once these are cleaned up, we can extend.
* | Fix a crash when pathoc connections failAldo Cortesi2016-06-102-66/+62
| | | | | | | | Use the new handler to tidy this up.
* | Merge remote-tracking branch 'upstream/master' into pathodlogAldo Cortesi2016-06-1011-61673/+1037
|\|
| * Merge pull request #1233 from gzzhanghao/masterMaximilian Hils2016-06-0910-61671/+1035
| |\ | | | | | | [web] ProxyApp and MainView with ES6
| | * [web] update buildJason2016-06-093-61343/+488
| | |
| | * [web] fix updateLocationJason2016-06-095-663/+853
| | |
| | * [web] rewrite ProxyApp and MainView with es6Jason2016-06-096-356/+385
| |/
| * fix default websocket stateMaximilian Hils2016-06-081-2/+2
| |
| * Merge pull request #1232 from cortesi/odictAldo Cortesi2016-06-098-334/+26
| |\ | | | | | | Remove odict
* | | Remove timestamps from pathoc outputAldo Cortesi2016-06-104-17/+21
| |/ |/| | | | | | | | | Pathoc is an interactive tool, no need for a long leading timestamp. More generally, make timestamps optional in the logging mechanism so we can configure this with command-line flags or something down the track.
* | Remove odictAldo Cortesi2016-06-098-334/+26
|/ | | | | | | | - Adds default implementations for _kconv and _reduce_values to MultiDict. Without these, operations fail in really, really non-obvious ways. - Replace the remaining few instances of ODict Fixes #1159
* Merge pull request #1220 from mitmproxy/add_sorting_with_reduxMaximilian Hils2016-06-087-816/+1097
|\ | | | | Add sorting with redux
| * sorting add pr review changesClemens2016-06-085-29/+60
| |
| * sorting done, ready to reviewClemens2016-06-072-7/+5
| |
| * sorting done, ready to reviewClemens2016-06-074-72/+58
| |
| * moved redux state injection closer to childClemens2016-06-073-16/+38
| |
| * start with sort, continue tomorrowClemens2016-06-073-36/+14
| |
| * moved sort state to redux, missing apply sortClemens2016-06-075-788/+1054
| |
* | properly fail on test failuresThomas Kriechbaumer2016-06-081-1/+1
| |
* | Merge pull request #1230 from redfast00/masterMaximilian Hils2016-06-081-2/+2
|\ \ | | | | | | fix after cleanup of netlib.utils in mitmproxy.console.statusbar
| * | fix after cleanup of netlib.utils in mitmproxy.console.statusbarredfast002016-06-081-2/+2
| | |
* | | Merge pull request #1223 from dufferzafar/pathod-lang-http2Thomas Kriechbaumer2016-06-083-42/+42
|\ \ \ | |/ / |/| | Python 3 - pathod.language.http2
| * | Py3: encode() the spec before appending to pathShadab Zafar2016-06-081-1/+1
| | |
| * | Py3: Find content-length header by bytesShadab Zafar2016-06-081-1/+1
| | |
| * | Py3: Pass bytes to http Request and ResponseShadab Zafar2016-06-081-5/+5
| | |
| * | Enable Travis for test_language_http2Shadab Zafar2016-06-081-1/+1
| | |
| * | Py3: Fix test_language_http2 tests by using byte literalsShadab Zafar2016-06-081-23/+23
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 19:26:21 +0000