Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1132 from mhils/improve-script-loading | Thomas Kriechbaumer | 2016-05-11 | 9 | -54/+76 |
|\ | | | | | Improve script loading | ||||
| * | improve script loading | Maximilian Hils | 2016-05-11 | 9 | -54/+76 |
|/ | |||||
* | actually fix tests | Maximilian Hils | 2016-05-10 | 1 | -2/+2 |
| | |||||
* | Revert "fix tests" | Maximilian Hils | 2016-05-10 | 7 | -84/+53 |
| | | | | This reverts commit f315dc1eb9f4701548fd57bbb38de1e9caa34e40. | ||||
* | fix tests | Maximilian Hils | 2016-05-10 | 7 | -53/+84 |
| | |||||
* | Merge pull request #1086 from Kriechi/h2-improv | Thomas Kriechbaumer | 2016-05-10 | 1 | -22/+7 |
|\ | | | | | cleanup h2 | ||||
| * | cleanup h2 layer | Thomas Kriechbaumer | 2016-05-10 | 1 | -22/+7 |
|/ | |||||
* | fix #1120 | Maximilian Hils | 2016-05-09 | 3 | -1/+15 |
| | |||||
* | fix mitmdump shutdown | Maximilian Hils | 2016-05-08 | 1 | -1/+1 |
| | |||||
* | mitmdump: make sure to always call done() in inline scripts | Maximilian Hils | 2016-05-08 | 1 | -0/+1 |
| | |||||
* | actually fix #1115 | Maximilian Hils | 2016-05-06 | 1 | -1/+1 |
| | |||||
* | issue-1115 | Maximilian Hils | 2016-05-06 | 1 | -2/+2 |
| | |||||
* | scripts: allow package imports | Maximilian Hils | 2016-05-03 | 1 | -0/+2 |
| | |||||
* | disable py.test timeout by default, this breaks interactive debuggers | Maximilian Hils | 2016-05-02 | 3 | -3/+3 |
| | |||||
* | web: update dependencies | Maximilian Hils | 2016-05-02 | 4 | -7914/+8022 |
| | |||||
* | Merge pull request #1107 from javabrett/dev-dot-sh | Thomas Kriechbaumer | 2016-05-01 | 1 | -1/+1 |
|\ | | | | | README.rst should refer to ./dev.sh not ./dev | ||||
| * | README.rst should refer to ./dev.sh not ./dev | Brett Randall | 2016-05-01 | 1 | -1/+1 |
|/ | |||||
* | docs: minor fixes | Maximilian Hils | 2016-04-30 | 5 | -4/+7 |
| | |||||
* | Merge pull request #1102 from mitmproxy/stateobject-list | Thomas Kriechbaumer | 2016-04-30 | 3 | -1/+80 |
|\ | | | | | Add support for stateobject lists | ||||
| * | stateobject: support lists | Maximilian Hils | 2016-04-29 | 3 | -1/+80 |
| | | |||||
* | | Include correct documentation URL in error message | Steven Noble | 2016-04-30 | 1 | -1/+1 |
|/ | |||||
* | fix bugs introduced in 317b4be | Maximilian Hils | 2016-04-29 | 1 | -2/+5 |
| | |||||
* | tcp protocol: stop on server shutdown | Maximilian Hils | 2016-04-29 | 1 | -1/+1 |
| | |||||
* | mitmdump: don't fail for other flowtypes | Maximilian Hils | 2016-04-29 | 3 | -19/+27 |
| | |||||
* | mitmdump: fix shutdown after reading flow file | Maximilian Hils | 2016-04-29 | 1 | -1/+0 |
| | |||||
* | fix bug introduced in 909d5ec | Maximilian Hils | 2016-04-29 | 1 | -1/+1 |
| | |||||
* | remove netlib version check | Maximilian Hils | 2016-04-29 | 3 | -32/+2 |
| | |||||
* | FlowReadError -> FlowReadException | Maximilian Hils | 2016-04-29 | 8 | -32/+31 |
| | |||||
* | fix #1089 | Maximilian Hils | 2016-04-28 | 2 | -4/+5 |
| | |||||
* | Update certinstall.rst | Maximilian Hils | 2016-04-28 | 1 | -2/+2 |
| | |||||
* | Generate better function names for root url. (#1100) | Zohar Lorberbaum | 2016-04-28 | 1 | -1/+3 |
| | |||||
* | support for setting/sending multiple cookies (#1091) | Steven Van Acker | 2016-04-22 | 2 | -4/+24 |
| | | | | | | * support for setting/sending multiple cookies * py.test for multiple cookie support | ||||
* | release: always build tags | Maximilian Hils | 2016-04-21 | 2 | -2/+2 |
| | |||||
* | silence flaky pathod test | Maximilian Hils | 2016-04-21 | 1 | -0/+1 |
| | |||||
* | update reverse proxy documentation, fix #1092 | Maximilian Hils | 2016-04-21 | 1 | -1/+3 |
| | |||||
* | dependency update | Maximilian Hils | 2016-04-21 | 1 | -2/+2 |
| | |||||
* | downgrade pyparsing to fix #1087 and #1090 | Maximilian Hils | 2016-04-21 | 2 | -4/+10 |
| | |||||
* | fix CONNECT display in upstream mode | Maximilian Hils | 2016-04-20 | 2 | -2/+3 |
| | |||||
* | mitmdump: allow stdin as infile | Maximilian Hils | 2016-04-18 | 1 | -4/+20 |
| | |||||
* | fix proxy authorization bug, refs #988 | Maximilian Hils | 2016-04-17 | 1 | -1/+1 |
| | |||||
* | cleanup mitmproxy.controller, raise Kill in Channel (#1085) | Maximilian Hils | 2016-04-14 | 16 | -178/+265 |
| | |||||
* | py3++ | Maximilian Hils | 2016-04-13 | 11 | -33/+36 |
| | |||||
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-04-13 | 2 | -3/+3 |
|\ | |||||
| * | gulp-minify-css is deprecated. Adding gulp-clean-css | Israel Blancas | 2016-04-11 | 2 | -3/+3 |
| | | |||||
* | | fix #1082 | Maximilian Hils | 2016-04-13 | 1 | -1/+1 |
| | | |||||
* | | minor improvements | Maximilian Hils | 2016-04-13 | 5 | -29/+13 |
|/ | |||||
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-04-11 | 1 | -0/+11 |
|\ | |||||
| * | Add installation instructions for Arch Linux (#1079) | Felix Yan | 2016-04-11 | 1 | -0/+11 |
| | | |||||
* | | peer_address -> ip_address | Maximilian Hils | 2016-04-11 | 9 | -23/+16 |
| | | |||||
* | | docs: better data structure docs | Maximilian Hils | 2016-04-11 | 7 | -76/+66 |
|/ |