Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update document for the removal of CONTENT_MISSING | Matthew Shao | 2016-03-26 | 1 | -2/+1 |
| | |||||
* | replace CONTENT_MISSING with None. | Matthew Shao | 2016-03-26 | 14 | -47/+37 |
| | |||||
* | Setting CONTENT_MISSING to None | Matthew Shao | 2016-03-26 | 1 | -1/+1 |
| | |||||
* | py3++ | Maximilian Hils | 2016-03-20 | 4 | -22/+30 |
| | |||||
* | netlib: request.path can be None | Maximilian Hils | 2016-03-20 | 2 | -2/+10 |
| | |||||
* | py3++ | Maximilian Hils | 2016-03-20 | 6 | -26/+44 |
| | |||||
* | py3++ | Maximilian Hils | 2016-03-20 | 3 | -52/+22 |
| | |||||
* | py3++ | Maximilian Hils | 2016-03-20 | 9 | -38/+37 |
| | |||||
* | Merge pull request #1047 from mitmproxy/no-coverage-by-default | Thomas Kriechbaumer | 2016-03-20 | 3 | -3/+3 |
|\ | | | | | py.test: disable coverage collection by default | ||||
| * | py.test: disable coverage collection by default | Maximilian Hils | 2016-03-20 | 3 | -3/+3 |
| | | |||||
* | | py3++: iteritems | Maximilian Hils | 2016-03-20 | 6 | -20/+28 |
| | | |||||
* | | py3++: cStringIO | Maximilian Hils | 2016-03-20 | 15 | -66/+59 |
|/ | |||||
* | Merge pull request #1045 from mitmproxy/py3-scripts | Maximilian Hils | 2016-03-20 | 11 | -26/+41 |
|\ | | | | | Port mitmproxy.script to Python 3 | ||||
| * | fix script exception display | Maximilian Hils | 2016-03-19 | 1 | -2/+4 |
| | | |||||
| * | port mitmproxy.scripts to py3 | Maximilian Hils | 2016-03-19 | 10 | -24/+37 |
| | | |||||
* | | Merge pull request #1043 from mitmproxy/better-scripts | Thomas Kriechbaumer | 2016-03-19 | 12 | -161/+186 |
|\| | | | | | Better scripts | ||||
| * | 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 | 2 | -3/+32 |
| | | |||||
| * | improve mitmproxy.scripts semantics, clean up tests | Maximilian Hils | 2016-03-19 | 8 | -72/+119 |
| | | |||||
* | | fix pyOpenSSL version | Maximilian Hils | 2016-03-19 | 1 | -1/+1 |
| | | |||||
* | | update pyOpenSSL | Maximilian Hils | 2016-03-19 | 1 | -2/+2 |
|/ | |||||
* | restrict cryptography version for pyopenssl compat | Maximilian Hils | 2016-03-19 | 1 | -1/+1 |
| | |||||
* | fix dependency versions | Maximilian Hils | 2016-03-18 | 1 | -4/+4 |
| | |||||
* | Merge remote-tracking branch 'origin/requires-io-master' | Maximilian Hils | 2016-03-18 | 1 | -4/+4 |
|\ | |||||
| * | [requires.io] dependency update | requires.io | 2016-03-18 | 1 | -4/+4 |
| | | |||||
* | | remove code duplication | Maximilian Hils | 2016-03-18 | 1 | -9/+6 |
|/ | |||||
* | Merge pull request #1040 from felixonmars/patch-1 | Thomas Kriechbaumer | 2016-03-18 | 1 | -1/+1 |
|\ | | | | | Allow lxml 3.6 | ||||
| * | 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 |
| | | | | |