aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* continue work on the proxyhandlerMaximilian Hils2014-01-0729-290/+664
|\
| * Merge pull request #192 from mitmproxy/refactor_read_http_bodyAldo Cortesi2014-01-042-8/+18
| |\
| | * move CONTINUE checks into mitmproxyMaximilian Hils2013-12-152-8/+18
| * | Merge pull request #193 from droope/search-functionalityAldo Cortesi2014-01-045-43/+353
| |\ \
| | * | now really fix it + testPedro Worcel2013-12-262-6/+29
| | * | 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-262-53/+137
| | * | fix failing testPedro Worcel2013-12-251-1/+2
| | * | fix crashroot2013-12-251-2/+2
| | * | Add focusing, and fixes non-clearance of prev searches. Addroot2013-12-253-45/+139
| | * | test passing, UI still not workingroot2013-12-244-6/+99
| | * | 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-054-8/+7
| |\ \ \
| | * | | Update another reference to PIL.Tomaz Muraus2014-01-041-1/+3
| | * | | Migrate from Pil to the latest version of Pillow.Tomaz Muraus2014-01-033-8/+5
| * | | | Merge pull request #198 from Kami/add_css_viewAldo Cortesi2014-01-045-2/+63
| |\ \ \ \
| | * | | | 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-044-2/+54
| | |/ / /
| * | | | Introduce file descriptor decorators for Request objectsAldo Cortesi2014-01-053-18/+36
| * | | | Decouple message type from message class name.Aldo Cortesi2014-01-043-20/+20
| * | | | Move app mechanism to flow.pyAldo Cortesi2014-01-046-133/+137
| * | | | 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-057-359/+180
|/ / /
* / / list mock as requirement (via @droope)Maximilian Hils2013-12-291-0/+1
|/ /
* | ignore web gui specific paths that won't get cleaned up when changing branchesMaximilian Hils2013-12-171-0/+2
* | merge smurfix/fix2, add serverconnect hook docs, adjust testsMaximilian Hils2013-12-169-21/+60
|\ \ | |/ |/|
| * 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
* | fix script path error in testsMaximilian Hils2013-12-152-2/+14
* | add @concurrent decorator for inline scripts, fixes #176Maximilian Hils2013-12-156-9/+128
* | 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-122-1/+14
* | change certificate path for android, fix #171Maximilian Hils2013-12-121-2/+2
* | ignore missing CN in certificates. fixes #169Maximilian Hils2013-12-123-1/+29
* | store resolved ip addresses, fixes #187Maximilian Hils2013-12-123-3/+17
* | Merge pull request #190 from BillinghamJ/patch-1Maximilian Hils2013-12-111-0/+3
|\ \
| * | Added small note of file formatJames Billingham2013-12-111-0/+3
|/ /
* | Merge remote-tracking branch 'origin/master'Maximilian Hils2013-12-112-2/+2
|\ \
| * \ Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-12-101-26/+19
| |\ \
| * | | Bump versionAldo Cortesi2013-12-102-2/+2
* | | | add documentation on how to use custom certificatesMaximilian Hils2013-12-111-0/+14
| |/ / |/| |
* | | ensure binary read on windowsMaximilian Hils2013-12-101-1/+2
| |/ |/|