Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1073 from mitmproxy/first-line-format | Thomas Kriechbaumer | 2016-04-03 | 2 | -14/+14 |
|\ | | | | | form_(in|out) -> first_line_format | ||||
| * | form_(in|out) -> first_line_format | Maximilian Hils | 2016-04-02 | 2 | -14/+14 |
| | | |||||
* | | response.msg -> response.reason | Maximilian Hils | 2016-04-02 | 1 | -2/+2 |
|/ | |||||
* | fix FlowMaster.create_request, add test | Maximilian Hils | 2016-04-02 | 1 | -0/+5 |
| | |||||
* | add Serializeable.copy | Maximilian Hils | 2016-04-02 | 1 | -0/+27 |
| | |||||
* | merge | Zohar Lorberbaum | 2016-03-28 | 1 | -1/+0 |
| | |||||
* | Merge remote-tracking branch 'mitmproxy/master' | Zohar Lorberbaum | 2016-03-28 | 1 | -1/+0 |
| | | | | Merge with master | ||||
* | Merge with master | Zohar Lorberbaum | 2016-03-28 | 5 | -13/+35 |
| | |||||
* | cleaner target url | Zohar Lorberbaum | 2016-03-28 | 1 | -6/+6 |
| | |||||
* | locust_task re-use locust_code. | Zohar Lorberbaum | 2016-03-27 | 1 | -15/+14 |
| | |||||
* | pep8 | Zohar Lorberbaum | 2016-03-25 | 1 | -12/+12 |
| | |||||
* | Add UI shortcuts. | Zohar Lorberbaum | 2016-03-24 | 1 | -0/+9 |
| | |||||
* | Flow export to locust.io load test tool. | Zohar Lorberbaum | 2016-03-23 | 1 | -2/+187 |
| | |||||
* | netlib: request.path can be None | Maximilian Hils | 2016-03-20 | 1 | -1/+6 |
| | |||||
* | py3++ | Maximilian Hils | 2016-03-20 | 2 | -51/+21 |
| | |||||
* | py3++ | Maximilian Hils | 2016-03-20 | 2 | -6/+6 |
| | |||||
* | py3++: cStringIO | Maximilian Hils | 2016-03-20 | 12 | -59/+52 |
| | |||||
* | port mitmproxy.scripts to py3 | Maximilian Hils | 2016-03-19 | 1 | -1/+1 |
| | |||||
* | fix tests on OSX | Maximilian Hils | 2016-03-19 | 1 | -5/+10 |
| | |||||
* | simplify tests for @concurrent | Maximilian Hils | 2016-03-19 | 3 | -89/+33 |
| | |||||
* | add tests for mitmproxy.script.reloader | Maximilian Hils | 2016-03-19 | 1 | -0/+29 |
| | |||||
* | improve mitmproxy.scripts semantics, clean up tests | Maximilian Hils | 2016-03-19 | 5 | -70/+107 |
| | |||||
* | Merge pull request #1014 from ikoz/master | Maximilian Hils | 2016-03-17 | 2 | -0/+42 |
|\ | | | | | New option: Add server certs to client chain | ||||
| * | Rename 'server' to 'upstream' in identifiers related to the ↵ | ikoz | 2016-03-16 | 2 | -14/+14 |
| | | | | | | | | AddServerCertsToClientChain feature | ||||
| * | 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 |
| | | |||||
* | | Merge pull request #1030 from xhy940801/socks | Maximilian Hils | 2016-03-16 | 1 | -0/+39 |
|\ \ | | | | | | | Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS | ||||
| * | | Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS | yonder | 2016-03-15 | 1 | -0/+39 |
| | | | |||||
* | | | Merge pull request #1019 from lilydjwg/master | Thomas Kriechbaumer | 2016-03-15 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | add resolved IP address in "Details" tab | ||||
| * | | | use "peer_address" instead of "sock_address" | lilydjwg | 2016-03-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix tests for "sock_address" | lilydjwg | 2016-03-14 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | 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 | 1 | -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 | 1 | -1/+16 |
| | | | |||||
* | | | 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 | 1 | -1/+7 |
| | | | |||||
* | | | 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 |
|/ / | |||||
* | | Merge pull request #969 from dufferzafar/pretty-export | Thomas Kriechbaumer | 2016-03-04 | 1 | -0/+31 |
|\ \ | | | | | | | Indent JSON body while exporting it as code | ||||
| * | | Add a test for json request | Shadab Zafar | 2016-03-04 | 1 | -0/+31 |
| | | | |||||
* | | | Merge pull request #989 from dufferzafar/har-extractor | Thomas Kriechbaumer | 2016-03-04 | 2 | -0/+115 |
|\ \ \ | |_|/ |/| | | Improve HAR Extractor Script | ||||
| * | | Use custom Context object | Shadab Zafar | 2016-03-04 | 1 | -6/+6 |
| | | | |||||
| * | | Test har_extractor.response | Shadab Zafar | 2016-03-04 | 2 | -0/+105 |
| | | | |||||
| * | | Add basic test for har_extractor | Shadab Zafar | 2016-03-04 | 1 | -0/+10 |
| |/ |