| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | fix display bugs (fixes #243) | Maximilian Hils | 2014-03-18 | 2 | -2/+7 |
* | forward proxy -> upstream proxy | Maximilian Hils | 2014-03-14 | 3 | -12/+12 |
* | remove debug switch | Maximilian Hils | 2014-03-13 | 1 | -5/+1 |
* | order command line options, add disting proxy option group | Maximilian Hils | 2014-03-13 | 2 | -64/+70 |
* | adjust command line docs, fix log typo | Maximilian Hils | 2014-03-13 | 2 | -3/+3 |
* | adjust tests, fix option handling | Maximilian Hils | 2014-03-13 | 2 | -2/+1 |
* | add support for log levels | Maximilian Hils | 2014-03-13 | 10 | -60/+65 |
* | add -d switch to mitmdump to compensate for old verbosity functionality | Maximilian Hils | 2014-03-12 | 3 | -15/+18 |
* | restrict -e to mitmproxy only (not mitmdump) | Maximilian Hils | 2014-03-12 | 4 | -14/+7 |
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-03-11 | 2 | -24/+36 |
|\ |
|
| * | Certificate forwarding. | Aldo Cortesi | 2014-03-11 | 2 | -24/+36 |
* | | fix temporary server change, coverage++ | Maximilian Hils | 2014-03-11 | 3 | -15/+14 |
|/ |
|
* | always use relative imports, fix status bar bug | Maximilian Hils | 2014-03-10 | 27 | -30/+54 |
* | split up protocol\__init__.py | Maximilian Hils | 2014-03-10 | 8 | -116/+113 |
* | Merge branch 'absolutely_relative_proxying' | Maximilian Hils | 2014-03-10 | 10 | -172/+199 |
|\ |
|
| * | update docs, fix #215 | Maximilian Hils | 2014-03-10 | 4 | -13/+15 |
| * | add advanced proxying options, add SSL-terminating capability to mitmproxy | Maximilian Hils | 2014-03-10 | 8 | -117/+140 |
| * | lay the foundations for --(in|out)(abs|rel) command line switches, as propose... | Maximilian Hils | 2014-03-10 | 4 | -55/+57 |
* | | Merge pull request #232 from benwa/patch-2 | Aldo Cortesi | 2014-03-10 | 1 | -6/+0 |
|\ \
| |/
|/| |
|
| * | Update layout.html | Bennett Blodinger | 2014-03-08 | 1 | -6/+0 |
* | | fix mentions of CONTENT_MISSING in libmproxy.console | Maximilian Hils | 2014-03-09 | 2 | -5/+7 |
* | | finish proxy.py split up | Maximilian Hils | 2014-03-09 | 13 | -256/+247 |
* | | split up proxy.py | Maximilian Hils | 2014-03-09 | 9 | -178/+193 |
|/ |
|
* | fix windows tests, include improvements from 0.10.1 | Maximilian Hils | 2014-03-08 | 1 | -0/+1 |
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-03-08 | 7 | -104/+177 |
|\ |
|
| * | Revert to old cert names, use a subdir for test conf dir. | Aldo Cortesi | 2014-03-07 | 1 | -3/+3 |
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-03-07 | 1 | -1/+0 |
| |\ |
|
| | * | remove redundant codeline | Sergey Chipiga | 2014-03-05 | 1 | -1/+0 |
| * | | Use the right conf dir... | Aldo Cortesi | 2014-03-07 | 1 | -1/+1 |
| |/ |
|
| * | Much more sophisticated cert handling | Aldo Cortesi | 2014-03-05 | 2 | -60/+45 |
| * | Minor cleanups. | Aldo Cortesi | 2014-03-02 | 3 | -11/+9 |
| * | Cipher specification. | Aldo Cortesi | 2014-03-02 | 1 | -5/+20 |
| * | Improve explicit certificate specification | Aldo Cortesi | 2014-03-02 | 2 | -13/+29 |
| * | Adapt for new pathod and netlib APIs. | Aldo Cortesi | 2014-03-02 | 2 | -3/+2 |
| * | add helpful messages on wrap | Pedro Worcel | 2014-02-22 | 1 | -11/+25 |
| * | fix the wrapping on backward searches | Pedro Worcel | 2014-02-22 | 1 | -15/+26 |
| * | add docs | Pedro Worcel | 2014-02-22 | 1 | -1/+2 |
| * | add multi-line support to backwards search | Pedro Worcel | 2014-02-22 | 1 | -7/+11 |
| * | add multi-line support | Pedro Worcel | 2014-02-22 | 1 | -3/+10 |
| * | add basic backwards search | Pedro Worcel | 2014-02-22 | 1 | -25/+49 |
* | | combine asterisk-form and origin-form into relative form | Maximilian Hils | 2014-03-08 | 1 | -10/+7 |
|/ |
|
* | fix bug: ensure that server connection is present for tcp connections | Maximilian Hils | 2014-02-17 | 1 | -0/+1 |
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-02-17 | 1 | -1/+1 |
|\ |
|
| * | Bump version | Maximilian Hils | 2014-02-11 | 1 | -1/+1 |
* | | fix comments | Maximilian Hils | 2014-02-09 | 2 | -6/+7 |
|/ |
|
* | Fix flow initialization order error | Aldo Cortesi | 2014-02-08 | 3 | -14/+16 |
* | Better response when mitmproxy crashes. | Aldo Cortesi | 2014-02-08 | 2 | -3/+8 |
* | add tests for reconnect to upstream proxy, ensure that server_reconnect is al... | Maximilian Hils | 2014-02-07 | 3 | -31/+36 |
* | Achievement Unlocked: Proxy Chain | Maximilian Hils | 2014-02-07 | 3 | -1/+4 |
* | coverage++ | Maximilian Hils | 2014-02-07 | 3 | -26/+43 |