| Commit message (Expand) | Author | Age | Files | Lines |
* | Bump version | Maximilian Hils | 2014-02-11 | 1 | -1/+1 |
* | 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 |
* | test libmproxy.app, increase coverage | Maximilian Hils | 2014-02-07 | 6 | -32/+47 |
* | finalize merge | Maximilian Hils | 2014-02-06 | 1 | -2/+2 |
* | 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 | 6 | -22/+29 |
* | mock urwid to run console tests on windows, push failing testcases down to 0.... | Maximilian Hils | 2014-02-05 | 1 | -1/+1 |
* | add skeleton to change destinatin server during intercept, fix all testcases ... | Maximilian Hils | 2014-02-05 | 5 | -67/+134 |
* | Merge branch 'master' into tcp_proxy | Maximilian Hils | 2014-02-05 | 1 | -2/+1 |
|\ |
|
| * | 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 | 7 | -15/+23 |
* | | push failing tests down to 43 | Maximilian Hils | 2014-02-04 | 4 | -155/+165 |
* | | add priorities for the destination server address | Maximilian Hils | 2014-02-04 | 2 | -55/+114 |
* | | bring failing tests back into the double-digit range | Maximilian Hils | 2014-01-31 | 7 | -144/+165 |
* | | remove _flow_map from state, improve logging | Maximilian Hils | 2014-01-31 | 4 | -16/+19 |
* | | fix server reconnect | Maximilian Hils | 2014-01-31 | 3 | -6/+9 |
* | | move StateObject back into libmproxy | Maximilian Hils | 2014-01-31 | 4 | -9/+112 |
* | | complete state handling | Maximilian Hils | 2014-01-30 | 2 | -6/+27 |
* | | add generic TCP handler with SSL support, move StateObject into netlib | Maximilian Hils | 2014-01-30 | 5 | -138/+117 |
* | | polish SimpleStateObject | Maximilian Hils | 2014-01-30 | 2 | -21/+42 |
* | | remove old classes | Maximilian Hils | 2014-01-30 | 4 | -883/+114 |
* | | merge flow classes. current status: basic mitmdump working | Maximilian Hils | 2014-01-30 | 6 | -480/+1112 |
* | | fix most testsuite errors, improve proxy error handling | Maximilian Hils | 2014-01-29 | 3 | -29/+71 |
* | | merge master | Maximilian Hils | 2014-01-28 | 4 | -21/+33 |
|\| |
|
| * | Nicer layout for cert install options. | Aldo Cortesi | 2014-01-28 | 2 | -12/+24 |
| * | Use the mitm.it domain for the app, turn it on by default. | Aldo Cortesi | 2014-01-27 | 1 | -3/+3 |
| * | Serve correct certs from app. Enable Windows and Android icons. | Aldo Cortesi | 2014-01-24 | 2 | -8/+8 |
* | | unify ipv4/ipv6 address handling | Maximilian Hils | 2014-01-28 | 2 | -32/+24 |
* | | merge master | Maximilian Hils | 2014-01-22 | 9 | -25/+24 |
|\| |
|
| * | Silence pyflakes | Aldo Cortesi | 2014-01-19 | 8 | -20/+15 |
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-19 | 1 | -5/+5 |
| |\ |
|
| * | | Handle views that don't support search gracefully | Aldo Cortesi | 2014-01-19 | 1 | -3/+12 |
| * | | Re-enable caching on search. | Aldo Cortesi | 2014-01-19 | 1 | -10/+3 |
* | | | Add functionality to transparently proxify connections to other HTTPS proxies | Maximilian Hils | 2014-01-18 | 2 | -6/+37 |
* | | | merge master | Maximilian Hils | 2014-01-18 | 19 | -98/+1873 |
|\ \ \
| | |/
| |/| |
|
| * | | fix sni bug: respond with the correct certificate | Maximilian Hils | 2014-01-16 | 1 | -5/+5 |
| |/ |
|
| * | Deprecate Flow.unload_script in favor of Flow.unload_scripts | Aldo Cortesi | 2014-01-13 | 1 | -5/+5 |
| * | Extract command parsing and use in script grid editor | Aldo Cortesi | 2014-01-13 | 2 | -12/+18 |
| * | Script refactoring: move script command parsing into script module. | Aldo Cortesi | 2014-01-12 | 5 | -18/+18 |
| * | Clean up and clarify script API | Aldo Cortesi | 2014-01-12 | 3 | -20/+12 |
| * | Start refactoring scripts | Aldo Cortesi | 2014-01-12 | 4 | -42/+45 |
| * | Update ViewProtobuf in contentview.py to also decode as protobuf if the conte... | Dan Wilbraham | 2014-01-05 | 1 | -1/+4 |
| * | Tweaking web stub app, icons for certificates, serve PEM correctly. | Aldo Cortesi | 2014-01-05 | 11 | -7/+1779 |
| * | Remove / binding alias for limit | Aldo Cortesi | 2014-01-05 | 1 | -2/+1 |