| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmprox... | Aldo Cortesi | 2014-01-05 | 1 | -5/+2 |
| |\ |
|
| | * | Migrate from Pil to the latest version of Pillow. | Tomaz Muraus | 2014-01-03 | 1 | -5/+2 |
| * | | Merge pull request #198 from Kami/add_css_view | Aldo Cortesi | 2014-01-04 | 2 | -1/+35 |
| |\ \ |
|
| | * | | Fix CSS view prompt, update display mode options. | Tomaz Muraus | 2014-01-04 | 2 | -1/+5 |
| | * | | Provide more sensible serializer options. | Tomaz Muraus | 2014-01-04 | 1 | -0/+5 |
| | * | | Add CSS view which beautifies CSS files if cssutils library is available, | Tomaz Muraus | 2014-01-04 | 1 | -1/+26 |
| | |/ |
|
| * | | Introduce file descriptor decorators for Request objects | Aldo Cortesi | 2014-01-05 | 3 | -18/+36 |
| * | | Decouple message type from message class name. | Aldo Cortesi | 2014-01-04 | 2 | -19/+19 |
| * | | Move app mechanism to flow.py | Aldo Cortesi | 2014-01-04 | 2 | -110/+113 |
| * | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-04 | 1 | -1/+1 |
| |\ \ |
|
| | * | | fix #195 | Maximilian Hils | 2014-01-03 | 1 | -1/+1 |
| | |/ |
|
| * / | Fix app in mitmproxy console, update to bootstrap 3. | Aldo Cortesi | 2014-01-03 | 6 | -80/+61 |
| |/ |
|
| * | merge smurfix/fix2, add serverconnect hook docs, adjust tests | Maximilian Hils | 2013-12-16 | 2 | -4/+18 |
| |\ |
|
| | * | Reconnect if the server-connect hook needs the request to decide what to do | Matthias Urlichs | 2013-12-12 | 1 | -4/+12 |
| | * | handle a hook changing connection parameters | Matthias Urlichs | 2013-12-12 | 1 | -1/+6 |
| | * | serverconnect hook: Set sc.request | Matthias Urlichs | 2013-12-12 | 1 | -2/+3 |
| * | | add @concurrent decorator for inline scripts, fixes #176 | Maximilian Hils | 2013-12-15 | 1 | -1/+25 |
| * | | Merge pull request #189 from mitmproxy/refactor_proxyhandler | Aldo Cortesi | 2013-12-13 | 1 | -74/+87 |
| |\ \
| |/
|/| |
|
| | * | add comments | Maximilian Hils | 2013-12-10 | 1 | -1/+18 |
| | * | refactor ProxyHandler, remove duplicate code | Maximilian Hils | 2013-12-10 | 1 | -74/+70 |
| * | | add content-length 0 if we remove header for chunked encoding, fixes #186 | Maximilian Hils | 2013-12-12 | 1 | -0/+2 |
| * | | ignore missing CN in certificates. fixes #169 | Maximilian Hils | 2013-12-12 | 1 | -1/+2 |
| * | | store resolved ip addresses, fixes #187 | Maximilian Hils | 2013-12-12 | 2 | -3/+12 |
| * | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2013-12-10 | 1 | -26/+19 |
| |\ \ |
|
| | * | | ensure binary read on windows | Maximilian Hils | 2013-12-10 | 1 | -1/+2 |
| | |/ |
|
| | * | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2013-12-09 | 1 | -2/+2 |
| | |\ |
|
| | * | | remove code duplication in ProxyHandler by unifying read_transparent and read... | Maximilian Hils | 2013-12-09 | 1 | -25/+17 |
| * | | | Bump version | Aldo Cortesi | 2013-12-10 | 1 | -1/+1 |
| | |/
|/| |
|
| * | | Small workaround to make mitmproxy work again. | Aldo Cortesi | 2013-12-09 | 1 | -2/+2 |
| |/ |
|
| * | backport changes to fix tests | Maximilian Hils | 2013-12-08 | 1 | -2/+3 |
| * | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-12-08 | 4 | -25/+49 |
| |\ |
|
| | * | Merge pull request #134 from mhils/scripts_improvements | Aldo Cortesi | 2013-12-08 | 5 | -44/+50 |
| | |\ |
|
| | * \ | Merge pull request #166 from ghjc/forward-proxy | Aldo Cortesi | 2013-12-08 | 2 | -2/+21 |
| | |\ \ |
|
| | | * | | Added -F http[s]://server:port option that allows MITM to forward traffic to ... | JC | 2013-08-30 | 2 | -2/+21 |
| | * | | | Merge pull request #170 from jsoriano/master | Aldo Cortesi | 2013-12-08 | 1 | -20/+17 |
| | |\ \ \ |
|
| | | * | | | New method establish_ssl to avoid duplicated code | Jaime Soriano Pastor | 2013-09-26 | 1 | -29/+15 |
| | | * | | | Reverse proxy works with SSL | Jaime Soriano Pastor | 2013-09-26 | 1 | -2/+13 |
| | | |/ / |
|
| | * | | | Merge pull request #180 from mitmproxy/add_serverconnection_scripthook | Aldo Cortesi | 2013-12-08 | 2 | -0/+8 |
| | |\ \ \ |
|
| | | * | | | add serverconnect script hook | Maximilian Hils | 2013-11-18 | 2 | -0/+8 |
| | | |/ / |
|
| | * | | | Merge pull request #184 from richie5um/RichS-RateDivideByZeroIssue | Aldo Cortesi | 2013-12-08 | 1 | -1/+1 |
| | |\ \ \ |
|
| | | * | | | Fix divide by zero issue when timestamp start and end are the same | Rich Somerfield | 2013-11-26 | 1 | -1/+1 |
| | | |/ / |
|
| | * / / | attempt to fix https://github.com/mitmproxy/netlib/issues/24 | Maximilian Hils | 2013-11-19 | 1 | -2/+2 |
| | |/ / |
|
| * | | | Merge pull request #161 from mitmproxy/external_webapp | Aldo Cortesi | 2013-12-08 | 4 | -25/+32 |
| |\ \ \ |
|
| | * | | | add option to expose webapp externally, remove distinct ip setting | Maximilian Hils | 2013-08-18 | 4 | -25/+32 |
| * | | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-09-14 | 5 | -6/+17 |
| |\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| | * | | Version bump. | Aldo Cortesi | 2013-08-25 | 1 | -1/+1 |
| | * | | Tweak timing display | Aldo Cortesi | 2013-08-23 | 4 | -10/+10 |
| | * | | console: Add support for displaying transfer rate | Kyle Manna | 2013-08-13 | 1 | -0/+3 |
| | * | | console: Add support for displaying elapsed time | Kyle Manna | 2013-08-13 | 2 | -1/+9 |
| | * | | utils: Add missing "B" for pretty_size() | Kyle Manna | 2013-08-13 | 1 | -1/+1 |
