| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | | get server reconnect right, fix timestamps | Maximilian Hils | 2014-01-18 | 2 | -65/+71 |
* | | small refactorings, bugs fixed | Maximilian Hils | 2014-01-18 | 2 | -30/+69 |
* | | add basic error handling | Maximilian Hils | 2014-01-13 | 2 | -79/+97 |
* | | fix header assembly, other improvements | Maximilian Hils | 2014-01-10 | 2 | -41/+69 |
* | | improve https handling | Maximilian Hils | 2014-01-09 | 2 | -33/+56 |
* | | groundwork completed | Maximilian Hils | 2014-01-09 | 2 | -116/+336 |
* | | continue work on the proxyhandler | Maximilian Hils | 2014-01-07 | 15 | -254/+481 |
|\| |
|
| * | Merge pull request #192 from mitmproxy/refactor_read_http_body | Aldo Cortesi | 2014-01-04 | 1 | -4/+14 |
| |\ |
|
| | * | move CONTINUE checks into mitmproxy | Maximilian Hils | 2013-12-15 | 1 | -4/+14 |
| * | | Merge pull request #193 from droope/search-functionality | Aldo Cortesi | 2014-01-04 | 3 | -39/+232 |
| |\ \ |
|
| | * | | now really fix it + test | Pedro Worcel | 2013-12-26 | 1 | -5/+9 |
| | * | | fix bug that happens after searching for a non-existant string, and | Pedro Worcel | 2013-12-26 | 1 | -1/+6 |
| | * | | add docs | Pedro Worcel | 2013-12-26 | 1 | -1/+2 |
| | * | | added 'n' functionality, tidy up & testing | Pedro Worcel | 2013-12-26 | 1 | -1/+9 |
| | * | | add looping around | Pedro Worcel | 2013-12-26 | 1 | -53/+116 |
| | * | | fix crash | root | 2013-12-25 | 1 | -2/+2 |
| | * | | Add focusing, and fixes non-clearance of prev searches. Add | root | 2013-12-25 | 1 | -33/+75 |
| | * | | test passing, UI still not working | root | 2013-12-24 | 2 | -6/+75 |
| | * | | add search with / for compatibility with what I'll do. | root | 2013-12-23 | 1 | -1/+2 |
| * | | | Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmprox... | Aldo Cortesi | 2014-01-05 | 1 | -5/+2 |
| |\ \ \ |
|
| | * | | | Migrate from Pil to the latest version of Pillow. | Tomaz Muraus | 2014-01-03 | 1 | -5/+2 |
| | |/ / |
|