Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| | | ||||||
* | | 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 | |
| |\ |