Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | 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 | 11 | -260/+296 |
| | | |||||
* | | remove _flow_map from state, improve logging | Maximilian Hils | 2014-01-31 | 6 | -21/+20 |
| | | |||||
* | | 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 | 8 | -60/+100 |
| | | |||||
* | | merge master | Maximilian Hils | 2014-01-28 | 106 | -41/+5870 |
|\| | |||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-28 | 3 | -12/+13 |
| |\ | |||||
| | * | actually remove test dependencies from requirements.txt | Maximilian Hils | 2014-01-28 | 3 | -12/+13 |
| | | | |||||
| * | | docs: fix spacing of page headers | Aldo Cortesi | 2014-01-28 | 1 | -1/+5 |
| |/ | |||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-28 | 2 | -3/+7 |
| |\ | |||||
| | * | move test requirements out of main requirements.txt | Maximilian Hils | 2014-01-28 | 2 | -3/+7 |
| | | | |||||
| * | | Changelog. | Aldo Cortesi | 2014-01-28 | 1 | -0/+18 |
| |/ | |||||
| * | Update contributors. | Aldo Cortesi | 2014-01-28 | 1 | -10/+19 |
| | | |||||
| * | travis: irc notifications | Aldo Cortesi | 2014-01-28 | 1 | -0/+7 |
| | | |||||
| * | Adjust docs for web app certificate installation. | Aldo Cortesi | 2014-01-28 | 9 | -37/+75 |
| | | |||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-28 | 2 | -4/+16 |
| |\ | |||||
| | * | print warning if netlib and mitmproxy versions are different. | Maximilian Hils | 2014-01-22 | 2 | -4/+16 |
| | | | |||||
| * | | Nicer layout for cert install options. | Aldo Cortesi | 2014-01-28 | 2 | -12/+24 |
| | | | |||||
| * | | Instructions for adding mitmproxy certificates to the Java trust store. | Aldo Cortesi | 2014-01-27 | 3 | -0/+15 |
| | | | | | | | | | | | | Fixes #146 | ||||
| * | | Use the mitm.it domain for the app, turn it on by default. | Aldo Cortesi | 2014-01-27 | 1 | -3/+3 |
| | | | |||||
| * | | Android doc update. | Aldo Cortesi | 2014-01-27 | 1 | -2/+5 |
| | | | |||||
| * | | Revert "Move the doc tree out into its own repo." | Aldo Cortesi | 2014-01-27 | 91 | -0/+5706 |
| | | | | | | | | | | | | This reverts commit 8f88fcedd601c0033b4469b66626a83011879baf. | ||||
| * | | 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 | 4 | -36/+28 |
| | | |||||
* | | merge master | Maximilian Hils | 2014-01-22 | 105 | -5769/+102 |
|\| | |||||
| * | travis: install netlib from git before installing requirements. | Aldo Cortesi | 2014-01-22 | 1 | -1/+1 |
| | |