aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | add docsPedro Worcel2013-12-261-1/+2
| | * | added 'n' functionality, tidy up & testingPedro Worcel2013-12-261-1/+9
| | * | add looping aroundPedro Worcel2013-12-261-53/+116
| | * | fix crashroot2013-12-251-2/+2
| | * | Add focusing, and fixes non-clearance of prev searches. Addroot2013-12-251-33/+75
| | * | test passing, UI still not workingroot2013-12-242-6/+75
| | * | add search with / for compatibility with what I'll do.root2013-12-231-1/+2
| * | | Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmprox...Aldo Cortesi2014-01-051-5/+2
| |\ \ \
| | * | | Migrate from Pil to the latest version of Pillow.Tomaz Muraus2014-01-031-5/+2
| | |/ /
| * | | Merge pull request #198 from Kami/add_css_viewAldo Cortesi2014-01-042-1/+35
| |\ \ \
| | * | | Fix CSS view prompt, update display mode options.Tomaz Muraus2014-01-042-1/+5
| | * | | Provide more sensible serializer options.Tomaz Muraus2014-01-041-0/+5
| | * | | Add CSS view which beautifies CSS files if cssutils library is available,Tomaz Muraus2014-01-041-1/+26
| | |/ /
| * | | Introduce file descriptor decorators for Request objectsAldo Cortesi2014-01-053-18/+36
| * | | Decouple message type from message class name.Aldo Cortesi2014-01-042-19/+19
| * | | Move app mechanism to flow.pyAldo Cortesi2014-01-042-110/+113
| * | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-041-1/+1
| |\ \ \
| | * | | fix #195Maximilian Hils2014-01-031-1/+1
| | |/ /
| * / / Fix app in mitmproxy console, update to bootstrap 3.Aldo Cortesi2014-01-036-80/+61
| |/ /
* / / first steps on tcp proxyingMaximilian Hils2014-01-053-358/+179
|/ /
* | merge smurfix/fix2, add serverconnect hook docs, adjust testsMaximilian Hils2013-12-162-4/+18
|\ \ | |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 08:55:12 +0000