aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
* add skeleton to change destinatin server during intercept, fix all testcases ...Maximilian Hils2014-02-055-67/+134
* Merge branch 'master' into tcp_proxyMaximilian Hils2014-02-051-2/+1
|\
| * 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-057-15/+23
* | push failing tests down to 43Maximilian Hils2014-02-044-155/+165
* | add priorities for the destination server addressMaximilian Hils2014-02-042-55/+114
* | bring failing tests back into the double-digit rangeMaximilian Hils2014-01-317-144/+165
* | remove _flow_map from state, improve loggingMaximilian Hils2014-01-314-16/+19
* | 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-293-29/+71
* | merge masterMaximilian Hils2014-01-284-21/+33
|\|
| * Nicer layout for cert install options.Aldo Cortesi2014-01-282-12/+24
| * Use the mitm.it domain for the app, turn it on by default.Aldo Cortesi2014-01-271-3/+3
| * Serve correct certs from app. Enable Windows and Android icons.Aldo Cortesi2014-01-242-8/+8
* | unify ipv4/ipv6 address handlingMaximilian Hils2014-01-282-32/+24
* | merge masterMaximilian Hils2014-01-229-25/+24
|\|
| * Silence pyflakesAldo Cortesi2014-01-198-20/+15
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-191-5/+5
| |\
| * | Handle views that don't support search gracefullyAldo Cortesi2014-01-191-3/+12
| * | Re-enable caching on search.Aldo Cortesi2014-01-191-10/+3
* | | Add functionality to transparently proxify connections to other HTTPS proxiesMaximilian Hils2014-01-182-6/+37
* | | merge masterMaximilian Hils2014-01-1819-98/+1873
|\ \ \ | | |/ | |/|
| * | fix sni bug: respond with the correct certificateMaximilian Hils2014-01-161-5/+5
| |/
| * Deprecate Flow.unload_script in favor of Flow.unload_scriptsAldo Cortesi2014-01-131-5/+5
| * Extract command parsing and use in script grid editorAldo Cortesi2014-01-132-12/+18
| * Script refactoring: move script command parsing into script module.Aldo Cortesi2014-01-125-18/+18
| * Clean up and clarify script APIAldo Cortesi2014-01-123-20/+12
| * Start refactoring scriptsAldo Cortesi2014-01-124-42/+45
| * Update ViewProtobuf in contentview.py to also decode as protobuf if the conte...Dan Wilbraham2014-01-051-1/+4
| * Tweaking web stub app, icons for certificates, serve PEM correctly.Aldo Cortesi2014-01-0511-7/+1779
| * Remove / binding alias for limitAldo Cortesi2014-01-051-2/+1
* | get server reconnect right, fix timestampsMaximilian Hils2014-01-182-65/+71
* | small refactorings, bugs fixedMaximilian Hils2014-01-182-30/+69
* | add basic error handlingMaximilian Hils2014-01-132-79/+97
* | fix header assembly, other improvementsMaximilian Hils2014-01-102-41/+69
* | improve https handlingMaximilian Hils2014-01-092-33/+56
* | groundwork completedMaximilian Hils2014-01-092-116/+336
* | continue work on the proxyhandlerMaximilian Hils2014-01-0715-254/+481
|\|
| * Merge pull request #192 from mitmproxy/refactor_read_http_bodyAldo Cortesi2014-01-041-4/+14
| |\
| | * move CONTINUE checks into mitmproxyMaximilian Hils2013-12-151-4/+14
| * | Merge pull request #193 from droope/search-functionalityAldo Cortesi2014-01-043-39/+232
| |\ \
| | * | now really fix it + testPedro Worcel2013-12-261-5/+9
| | * | fix bug that happens after searching for a non-existant string, andPedro Worcel2013-12-261-1/+6