aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cleanup: fix unit tests, simpler app test, remove print statementsAldo Cortesi2014-02-089-85/+76
* fix testsMaximilian Hils2014-02-071-0/+3
* add tests for reconnect to upstream proxy, ensure that server_reconnect is al...Maximilian Hils2014-02-075-41/+137
* Achievement Unlocked: Proxy ChainMaximilian Hils2014-02-076-9/+78
* fix race conditions in test suiteMaximilian Hils2014-02-073-9/+20
* coverage++Maximilian Hils2014-02-077-31/+147
* test libmproxy.app, increase coverageMaximilian Hils2014-02-077-32/+97
* finalize mergeMaximilian Hils2014-02-062-4/+4
* add functionality to change the destination serverMaximilian Hils2014-02-063-25/+55
* remove LEGACY switches, always update flow.server_connMaximilian Hils2014-02-061-13/+10
* fix bugs, expose timestamp information to console uiMaximilian Hils2014-02-068-26/+32
* mock urwid to run console tests on windows, push failing testcases down to 0....Maximilian Hils2014-02-054-16/+22
* add skeleton to change destinatin server during intercept, fix all testcases ...Maximilian Hils2014-02-059-79/+159
* Merge branch 'master' into tcp_proxyMaximilian Hils2014-02-052-2/+18
|\
| * add example to show how to read mitmproxy dump files, refs #207Maximilian Hils2014-02-041-0/+17
| * shutdown properly if we dont keep servingMaximilian Hils2014-02-041-1/+1
| * fixing bug: AttributeError: DumpMaster instance has no attribute 'unload_script'Steven Van Acker2014-02-041-2/+1
* | fix all tests except those using set_url and get_urlMaximilian Hils2014-02-0512-93/+74
* | push failing tests down to 43Maximilian Hils2014-02-048-248/+228
* | add priorities for the destination server addressMaximilian Hils2014-02-042-55/+114
* | bring failing tests back into the double-digit rangeMaximilian Hils2014-01-3111-260/+296
* | remove _flow_map from state, improve loggingMaximilian Hils2014-01-316-21/+20
* | fix server reconnectMaximilian Hils2014-01-313-6/+9
* | move StateObject back into libmproxyMaximilian Hils2014-01-314-9/+112
* | complete state handlingMaximilian Hils2014-01-302-6/+27
* | add generic TCP handler with SSL support, move StateObject into netlibMaximilian Hils2014-01-305-138/+117
* | polish SimpleStateObjectMaximilian Hils2014-01-302-21/+42
* | remove old classesMaximilian Hils2014-01-304-883/+114
* | merge flow classes. current status: basic mitmdump workingMaximilian Hils2014-01-306-480/+1112
* | fix most testsuite errors, improve proxy error handlingMaximilian Hils2014-01-298-60/+100
* | merge masterMaximilian Hils2014-01-28106-41/+5870
|\|
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-283-12/+13
| |\
| | * actually remove test dependencies from requirements.txtMaximilian Hils2014-01-283-12/+13
| * | docs: fix spacing of page headersAldo Cortesi2014-01-281-1/+5
| |/
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-282-3/+7
| |\
| | * move test requirements out of main requirements.txtMaximilian Hils2014-01-282-3/+7
| * | Changelog.Aldo Cortesi2014-01-281-0/+18
| |/
| * Update contributors.Aldo Cortesi2014-01-281-10/+19
| * travis: irc notificationsAldo Cortesi2014-01-281-0/+7
| * Adjust docs for web app certificate installation.Aldo Cortesi2014-01-289-37/+75
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-282-4/+16
| |\
| | * print warning if netlib and mitmproxy versions are different.Maximilian Hils2014-01-222-4/+16
| * | Nicer layout for cert install options.Aldo Cortesi2014-01-282-12/+24
| * | Instructions for adding mitmproxy certificates to the Java trust store.Aldo Cortesi2014-01-273-0/+15
| * | Use the mitm.it domain for the app, turn it on by default.Aldo Cortesi2014-01-271-3/+3
| * | Android doc update.Aldo Cortesi2014-01-271-2/+5
| * | Revert "Move the doc tree out into its own repo."Aldo Cortesi2014-01-2791-0/+5706
| * | Serve correct certs from app. Enable Windows and Android icons.Aldo Cortesi2014-01-242-8/+8
| |/
* | unify ipv4/ipv6 address handlingMaximilian Hils2014-01-284-36/+28
* | merge masterMaximilian Hils2014-01-22105-5769/+102
|\|