aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/ |/|
| * Reconnect if the server-connect hook needs the request to decide what to doMatthias Urlichs2013-12-121-4/+12
| * handle a hook changing connection parametersMatthias Urlichs2013-12-121-1/+6
| * serverconnect hook: Set sc.requestMatthias Urlichs2013-12-121-2/+3
* | add @concurrent decorator for inline scripts, fixes #176Maximilian Hils2013-12-151-1/+25
* | Merge pull request #189 from mitmproxy/refactor_proxyhandlerAldo Cortesi2013-12-131-74/+87
|\ \ | |/ |/|
| * add commentsMaximilian Hils2013-12-101-1/+18
| * refactor ProxyHandler, remove duplicate codeMaximilian Hils2013-12-101-74/+70
* | add content-length 0 if we remove header for chunked encoding, fixes #186Maximilian Hils2013-12-121-0/+2
* | ignore missing CN in certificates. fixes #169Maximilian Hils2013-12-121-1/+2
* | store resolved ip addresses, fixes #187Maximilian Hils2013-12-122-3/+12
* | Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-12-101-26/+19
|\ \
| * | ensure binary read on windowsMaximilian Hils2013-12-101-1/+2
| |/
| * Merge remote-tracking branch 'origin/master'Maximilian Hils2013-12-091-2/+2
| |\
| * | remove code duplication in ProxyHandler by unifying read_transparent and read...Maximilian Hils2013-12-091-25/+17
* | | Bump versionAldo Cortesi2013-12-101-1/+1
| |/ |/|
* | Small workaround to make mitmproxy work again.Aldo Cortesi2013-12-091-2/+2
|/
* backport changes to fix testsMaximilian Hils2013-12-081-2/+3
* Merge branch 'master' into 0.10Maximilian Hils2013-12-084-25/+49
|\
| * Merge pull request #134 from mhils/scripts_improvementsAldo Cortesi2013-12-085-44/+50
| |\
| * \ Merge pull request #166 from ghjc/forward-proxyAldo Cortesi2013-12-082-2/+21
| |\ \
| | * | Added -F http[s]://server:port option that allows MITM to forward traffic to ...JC2013-08-302-2/+21