| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Allow lxml 3.6 | Felix Yan | 2016-03-18 | 1 | -1/+1 |
| | | | | All tests passed here, and it works fine. | ||||
| * | Merge pull request #1014 from ikoz/master | Maximilian Hils | 2016-03-17 | 7 | -6/+86 |
| |\ | | | | | New option: Add server certs to client chain | ||||
| | * | Make the add-server-certs-to-client-chain and verify-upstream-cert options ↵ | ikoz | 2016-03-16 | 1 | -3/+15 |
| | | | | | | | | | mutually exclusive whily processing the proxy options. Do the same for the add-server-certs-to-client-chain and no-upstream-cert options. | ||||
| | * | Revert "Create mutually exclusive group for add-server-certs-to-client-chain ↵ | ikoz | 2016-03-16 | 1 | -3/+2 |
| | | | | | | | | | | | | | and verify-upstream-cert command line options. These are not meaningful together." This reverts commit 02e378486b9daa7159503a4bdcd7bed9d85e119e. | ||||
| | * | Rename 'server' to 'upstream' in identifiers related to the ↵ | ikoz | 2016-03-16 | 5 | -22/+22 |
| | | | | | | | | | AddServerCertsToClientChain feature | ||||
| | * | Create mutually exclusive group for add-server-certs-to-client-chain and ↵ | ikoz | 2016-03-16 | 1 | -2/+3 |
| | | | | | | | | | verify-upstream-cert command line options. These are not meaningful together. | ||||
| | * | Move more init things inside AddServerCertsToClientChainMixin | ikoz | 2016-03-16 | 1 | -20/+13 |
| | | | |||||
| | * | Restructuring of the AddServerCertsToClientChain test so that it uses a ↵ | ikoz | 2016-03-16 | 1 | -38/+25 |
| | | | | | | | | | Mixin - also removed some extra printf statements | ||||
| | * | Add tests for add-server-certs-to-client-chain feature | ikoz | 2016-03-15 | 2 | -0/+62 |
| | | | |||||
| | * | fix for sslinfo cert chain printing bug - now all certs get printed | ikoz | 2016-03-15 | 1 | -2/+3 |
| | | | |||||
| | * | New option: Add server certs to client chain | ikoz | 2016-03-08 | 4 | -1/+26 |
| | | | | | | | | | | | | | If enabled, append all server certificates to the certificate chain served to the client, as extras. Can be used to bypass certain certificate pinning impementations. | ||||
| * | | Merge pull request #1032 from cle1000/patch-2 | Maximilian Hils | 2016-03-16 | 1 | -1/+1 |
| |\ \ | | | | | | | Update modify_response_body.py | ||||
| | * | | Update modify_response_body.py | cle1000 | 2016-03-15 | 1 | -1/+1 |
| | | | | | | | | | | fix typo | ||||
| * | | | Merge pull request #1030 from xhy940801/socks | Maximilian Hils | 2016-03-16 | 2 | -1/+96 |
| |\ \ \ | | | | | | | | | Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS | ||||
| | * | | | Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS | yonder | 2016-03-15 | 2 | -1/+96 |
| | | | | | |||||
| * | | | | Merge pull request #1019 from lilydjwg/master | Thomas Kriechbaumer | 2016-03-15 | 5 | -0/+7 |
| |\ \ \ \ | |_|/ / |/| | | | add resolved IP address in "Details" tab | ||||
| | * | | | use "peer_address" instead of "sock_address" | lilydjwg | 2016-03-15 | 5 | -7/+7 |
| | | | | | |||||
| | * | | | fix tests for "sock_address" | lilydjwg | 2016-03-14 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | add resolved IP address in "Details" tab | 依云 | 2016-03-10 | 4 | -0/+6 |
| | | | | | |||||
| * | | | | fix #1025, refs #983 | Maximilian Hils | 2016-03-12 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge pull request #1027 from gzzhanghao/vscroll | Maximilian Hils | 2016-03-12 | 2 | -3/+5 |
| |\ \ \ \ | | | | | | | | | | | [web] fix virtual scroll range | ||||
| | * | | | | [web] fix virtual scroll range | Jason | 2016-03-12 | 2 | -3/+5 |
| | | | | | | |||||
| * | | | | | minor pyinstaller fixes | Maximilian Hils | 2016-03-12 | 1 | -14/+17 |
| | | | | | | |||||
| * | | | | | Merge pull request #1011 from MatthewShao/master | Thomas Kriechbaumer | 2016-03-11 | 1 | -1/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix #1005 | ||||
| | * | | | | | Add update_focus method in console/__init__.py. | Matthew Shao | 2016-03-11 | 1 | -2/+5 |
| | | | | | | | |||||
| | * | | | | | Fix #1005 | Matthew Shao | 2016-03-08 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1008 from dufferzafar/test-examples | Maximilian Hils | 2016-03-11 | 7 | -47/+123 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Some tests for examples | ||||
| | * | | | | | | Update contentview test | Shadab Zafar | 2016-03-11 | 1 | -4/+9 |
| | | | | | | | | |||||
| | * | | | | | | Move har_extractor tests to the examples file | Shadab Zafar | 2016-03-11 | 2 | -37/+24 |
| | | | | | | | | |||||
| | * | | | | | | Use the contextmanager in all tests | Shadab Zafar | 2016-03-11 | 2 | -44/+50 |
| | | | | | | | | |||||
| | * | | | | | | Add contextmanager to load an example | Shadab Zafar | 2016-03-11 | 1 | -10/+15 |
| | | | | | | | | |||||
| | * | | | | | | Add tests for redirect_requests example | Shadab Zafar | 2016-03-11 | 1 | -0/+7 |
| | | | | | | | | |||||
| | * | | | | | | Add test for iframe_injector example | Shadab Zafar | 2016-03-11 | 2 | -2/+17 |
| | | | | | | | | |||||
| | * | | | | | | Add tests for custom_contentviews example | Shadab Zafar | 2016-03-11 | 1 | -1/+9 |
| | | | | | | | | |||||
| | * | | | | | | Add tests for modify_response_body example | Shadab Zafar | 2016-03-11 | 1 | -0/+16 |
| | | | | | | | | |||||
| | * | | | | | | Remove missing import | Shadab Zafar | 2016-03-11 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Update modify_querystring example & add test for it | Shadab Zafar | 2016-03-11 | 2 | -4/+9 |
| | | | | | | | | |||||
| | * | | | | | | Add tests for add_header example | Shadab Zafar | 2016-03-11 | 1 | -0/+7 |
| | | | | | | | | |||||
| | * | | | | | | Add tests for modify_form example | Shadab Zafar | 2016-03-11 | 1 | -1/+17 |
| | | | | | | | | |||||
| | * | | | | | | Update modify_form example to not use deprecated functions | Shadab Zafar | 2016-03-11 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1023 from adityadivekar03/issue981 | Maximilian Hils | 2016-03-11 | 5 | -5/+10 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add mitmproxy icon for binaries | ||||
| | * | | | | | | Add icon for binaries | Aditya | 2016-03-11 | 5 | -5/+10 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #1022 from dufferzafar/fix-1018 | Thomas Kriechbaumer | 2016-03-11 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix missing cookie import | ||||
| | * | | | | | | Fix missing cookie import | Shadab Zafar | 2016-03-11 | 1 | -2/+2 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-03-10 | 12 | -1046/+2150 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | Merge pull request #1004 from gzzhanghao/vscroll | Maximilian Hils | 2016-03-10 | 11 | -1027/+2135 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | [web] VirtualScroll and AutoScroll helper | ||||
| | | * | | | | [web] VirtualScroll and AutoScroll helper | Jason | 2016-03-10 | 11 | -1027/+2135 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #1012 from gzzhanghao/router | Maximilian Hils | 2016-03-09 | 3 | -20/+14 |
| | |\ \ \ \ | | | | | | | | | | | | | [web] eliminate common.Router.getParams | ||||
| | | * | | | | [web] eliminate common.Router.getParams | Jason | 2016-03-09 | 3 | -20/+14 |
| | | |/ / / | |||||
| | * | | | | Merge pull request #1015 from gzzhanghao/props | Maximilian Hils | 2016-03-09 | 2 | -4/+6 |
| | |\ \ \ \ | | | | | | | | | | | | | [web] dont mutate props | ||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |