aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Collapse)AuthorAgeFilesLines
* Silence pyflakesAldo Cortesi2014-01-198-20/+15
| | | | And pick up one bug as a consequence.
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-191-5/+5
|\
| * fix sni bug: respond with the correct certificateMaximilian Hils2014-01-161-5/+5
| |
* | Handle views that don't support search gracefullyAldo Cortesi2014-01-191-3/+12
| | | | | | | | | | This includes all key/value formatted views, e.g. the image view. We need to support these ultimately, but no time before the next release.
* | Re-enable caching on search.Aldo Cortesi2014-01-191-10/+3
|/
* Deprecate Flow.unload_script in favor of Flow.unload_scriptsAldo Cortesi2014-01-131-5/+5
| | | | | In the presence of arguments, unloading a single script is clumsy and less useful.
* 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
| | | | | - Move ScriptContext into script module - Use mock module instead of hand-rolled mock objects in tests
* Update ViewProtobuf in contentview.py to also decode as protobuf if the ↵Dan Wilbraham2014-01-051-1/+4
| | | | content_type is "application/x-protobuffer"
* 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
| | | | The search and limit functionality is too different.
* Merge pull request #192 from mitmproxy/refactor_read_http_bodyAldo Cortesi2014-01-041-4/+14
|\ | | | | move CONTINUE checks into mitmproxy
| * move CONTINUE checks into mitmproxyMaximilian Hils2013-12-151-4/+14
| |
* | Merge pull request #193 from droope/search-functionalityAldo Cortesi2014-01-043-39/+232
|\ \ | | | | | | Search functionality
| * | 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
| | | | | | | | | | | | later for an existant one.
| * | 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
| | | | | | | | | | | | documentation.
| * | 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 ↵Aldo Cortesi2014-01-051-5/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/Kami/mitmproxy into Kami-migrate_from_pil_to_pillow Conflicts: requirements.txt
| * | | 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
|\ \ \ | | | | | | | | Add CSS view which beautifies minified CSS files
| * | | 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
| |/ / | | | | | | | | | otherwise it acts as a no-op.
* | | Introduce file descriptor decorators for Request objectsAldo Cortesi2014-01-053-18/+36
| | | | | | | | | | | | Which lets us enable the apps again, now running from flow.py
* | | Decouple message type from message class name.Aldo Cortesi2014-01-042-19/+19
| | |
* | | Move app mechanism to flow.pyAldo Cortesi2014-01-042-110/+113
| | | | | | | | | | | | Disable apps while message passing is improved.
* | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-041-1/+1
|\ \ \
| * | | fix #195Maximilian Hils2014-01-031-1/+1
| |/ / | | | | | | (untested)
* / / Fix app in mitmproxy console, update to bootstrap 3.Aldo Cortesi2014-01-036-80/+61
|/ /
* | 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
| | | | | | | | | | | | | | The serverconnect hook script might need to examine the incoming request in order to set up the server connection. Example use: bind to a distinct source IPv6 address for each client.
* | 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
|\ \ | |/ |/| Refactor ProxyHandler
| * 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
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-01 15:55:05 +0000