Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | finish proxy.py split up | Maximilian Hils | 2014-03-09 | 22 | -288/+289 |
| | |||||
* | split up proxy.py | Maximilian Hils | 2014-03-09 | 13 | -188/+207 |
| | |||||
* | fix windows tests, include improvements from 0.10.1 | Maximilian Hils | 2014-03-08 | 4 | -5/+8 |
| | |||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-03-08 | 15 | -227/+384 |
|\ | |||||
| * | Revert to old cert names, use a subdir for test conf dir. | Aldo Cortesi | 2014-03-07 | 3 | -5/+5 |
| | | |||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-03-07 | 1 | -1/+0 |
| |\ | |||||
| | * | Merge pull request #230 from sergeychipiga/fix/remove-redundant-codeline | Maximilian Hils | 2014-03-05 | 1 | -1/+0 |
| | |\ | | | | | | | | | remove redundant codeline | ||||
| | | * | 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 | 7 | -80/+63 |
| | | | | | | | | | | | | - Specify per-domain certificates and keys - Certs are no longer regenerated for SANs - And more. :) | ||||
| * | Minor cleanups. | Aldo Cortesi | 2014-03-02 | 6 | -16/+13 |
| | | |||||
| * | Cipher specification. | Aldo Cortesi | 2014-03-02 | 1 | -5/+20 |
| | | |||||
| * | Improve explicit certificate specification | Aldo Cortesi | 2014-03-02 | 4 | -16/+36 |
| | | | | | | | | | | - Support cert/key in the same PEM file - Rationalize arguments, expand tests, clean up a bit | ||||
| * | Update for pathod.SSLOptions changes. | Aldo Cortesi | 2014-03-02 | 1 | -1/+1 |
| | | |||||
| * | Adapt for new pathod and netlib APIs. | Aldo Cortesi | 2014-03-02 | 4 | -9/+12 |
| | | |||||
| * | Merge pull request #223 from droope/improve-backwards-search | Aldo Cortesi | 2014-02-26 | 3 | -141/+281 |
| |\ | | | | | | | Improve search to also search backwards. | ||||
| | * | add helpful messages on wrap | Pedro Worcel | 2014-02-22 | 2 | -12/+26 |
| | | | |||||
| | * | fix the wrapping on backward searches | Pedro Worcel | 2014-02-22 | 2 | -16/+45 |
| | | | |||||
| | * | add docs | Pedro Worcel | 2014-02-22 | 1 | -1/+2 |
| | | | |||||
| | * | add multi-line support to backwards search | Pedro Worcel | 2014-02-22 | 2 | -15/+41 |
| | | | |||||
| | * | add multi-line support | Pedro Worcel | 2014-02-22 | 2 | -3/+25 |
| | | | |||||
| | * | add basic backwards search | Pedro Worcel | 2014-02-22 | 3 | -122/+170 |
| |/ | |||||
* / | combine asterisk-form and origin-form into relative form | Maximilian Hils | 2014-03-08 | 3 | -18/+15 |
|/ | |||||
* | 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 |
| | | | | | | Do it now already so that mitmproxy will warn the user if netlib is not from master. | ||||
* | | fix comments | Maximilian Hils | 2014-02-09 | 2 | -6/+7 |
|/ | |||||
* | Fix flow initialization order error | Aldo Cortesi | 2014-02-08 | 4 | -15/+16 |
| | | | | Resolves #210 | ||||
* | Better response when mitmproxy crashes. | Aldo Cortesi | 2014-02-08 | 2 | -3/+8 |
| | |||||
* | Merge pull request #208 from kmike/pillow-setuppy | Aldo Cortesi | 2014-02-08 | 1 | -1/+1 |
|\ | | | | | Remove upper bound for Pillow in setup.py | ||||
| * | remove upper bound for Pillow in setup.py | Mikhail Korobov | 2014-02-05 | 1 | -1/+1 |
| | | |||||
* | | Cleanup: fix unit tests, simpler app test, remove print statements | Aldo Cortesi | 2014-02-08 | 9 | -85/+76 |
| | | |||||
* | | fix tests | Maximilian Hils | 2014-02-07 | 1 | -0/+3 |
| | | |||||
* | | add tests for reconnect to upstream proxy, ensure that server_reconnect is ↵ | Maximilian Hils | 2014-02-07 | 5 | -41/+137 |
| | | | | | | | | always hooked | ||||
* | | Achievement Unlocked: Proxy Chain | Maximilian Hils | 2014-02-07 | 6 | -9/+78 |
| | | |||||
* | | fix race conditions in test suite | Maximilian Hils | 2014-02-07 | 3 | -9/+20 |
| | | |||||
* | | coverage++ | Maximilian Hils | 2014-02-07 | 7 | -31/+147 |
| | | |||||
* | | test libmproxy.app, increase coverage | Maximilian Hils | 2014-02-07 | 7 | -32/+97 |
| | | |||||
* | | finalize merge | Maximilian Hils | 2014-02-06 | 2 | -4/+4 |
| | | |||||
* | | add functionality to change the destination server | Maximilian Hils | 2014-02-06 | 3 | -25/+55 |
| | | |||||
* | | remove LEGACY switches, always update flow.server_conn | Maximilian Hils | 2014-02-06 | 1 | -13/+10 |
| | | |||||
* | | fix bugs, expose timestamp information to console ui | Maximilian Hils | 2014-02-06 | 8 | -26/+32 |
| | | |||||
* | | mock urwid to run console tests on windows, push failing testcases down to ↵ | Maximilian Hils | 2014-02-05 | 4 | -16/+22 |
| | | | | | | | | 0. :-) | ||||
* | | add skeleton to change destinatin server during intercept, fix all testcases ↵ | Maximilian Hils | 2014-02-05 | 9 | -79/+159 |
| | | | | | | | | on windows | ||||
* | | Merge branch 'master' into tcp_proxy | Maximilian Hils | 2014-02-05 | 2 | -2/+18 |
|\| | |||||
| * | add example to show how to read mitmproxy dump files, refs #207 | Maximilian Hils | 2014-02-04 | 1 | -0/+17 |
| | | |||||
| * | shutdown properly if we dont keep serving | Maximilian Hils | 2014-02-04 | 1 | -1/+1 |
| | | |||||
| * | fixing bug: AttributeError: DumpMaster instance has no attribute 'unload_script' | Steven Van Acker | 2014-02-04 | 1 | -2/+1 |
| | | |||||
* | | fix all tests except those using set_url and get_url | Maximilian Hils | 2014-02-05 | 12 | -93/+74 |
| | | |||||
* | | push failing tests down to 43 | Maximilian Hils | 2014-02-04 | 8 | -248/+228 |
| | |