aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* py3++Maximilian Hils2016-03-209-38/+37
|
* Merge pull request #1047 from mitmproxy/no-coverage-by-defaultThomas Kriechbaumer2016-03-203-3/+3
|\ | | | | py.test: disable coverage collection by default
| * py.test: disable coverage collection by defaultMaximilian Hils2016-03-203-3/+3
| |
* | py3++: iteritemsMaximilian Hils2016-03-206-20/+28
| |
* | py3++: cStringIOMaximilian Hils2016-03-2015-66/+59
|/
* Merge pull request #1045 from mitmproxy/py3-scriptsMaximilian Hils2016-03-2011-26/+41
|\ | | | | Port mitmproxy.script to Python 3
| * fix script exception displayMaximilian Hils2016-03-191-2/+4
| |
| * port mitmproxy.scripts to py3Maximilian Hils2016-03-1910-24/+37
| |
* | Merge pull request #1043 from mitmproxy/better-scriptsThomas Kriechbaumer2016-03-1912-161/+186
|\| | | | | Better scripts
| * fix tests on OSXMaximilian Hils2016-03-191-5/+10
| |
| * simplify tests for @concurrentMaximilian Hils2016-03-193-89/+33
| |
| * add tests for mitmproxy.script.reloaderMaximilian Hils2016-03-192-3/+32
| |
| * improve mitmproxy.scripts semantics, clean up testsMaximilian Hils2016-03-198-72/+119
| |
* | fix pyOpenSSL versionMaximilian Hils2016-03-191-1/+1
| |
* | update pyOpenSSLMaximilian Hils2016-03-191-2/+2
|/
* restrict cryptography version for pyopenssl compatMaximilian Hils2016-03-191-1/+1
|
* fix dependency versionsMaximilian Hils2016-03-181-4/+4
|
* Merge remote-tracking branch 'origin/requires-io-master'Maximilian Hils2016-03-181-4/+4
|\
| * [requires.io] dependency updaterequires.io2016-03-181-4/+4
| |
* | remove code duplicationMaximilian Hils2016-03-181-9/+6
|/
* Merge pull request #1040 from felixonmars/patch-1Thomas Kriechbaumer2016-03-181-1/+1
|\ | | | | Allow lxml 3.6
| * Allow lxml 3.6Felix Yan2016-03-181-1/+1
|/ | | All tests passed here, and it works fine.
* Merge pull request #1014 from ikoz/masterMaximilian Hils2016-03-177-6/+86
|\ | | | | New option: Add server certs to client chain
| * Make the add-server-certs-to-client-chain and verify-upstream-cert options ↵ikoz2016-03-161-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 ↵ikoz2016-03-161-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 ↵ikoz2016-03-165-22/+22
| | | | | | | | AddServerCertsToClientChain feature
| * Create mutually exclusive group for add-server-certs-to-client-chain and ↵ikoz2016-03-161-2/+3
| | | | | | | | verify-upstream-cert command line options. These are not meaningful together.
| * Move more init things inside AddServerCertsToClientChainMixinikoz2016-03-161-20/+13
| |
| * Restructuring of the AddServerCertsToClientChain test so that it uses a ↵ikoz2016-03-161-38/+25
| | | | | | | | Mixin - also removed some extra printf statements
| * Add tests for add-server-certs-to-client-chain featureikoz2016-03-152-0/+62
| |
| * fix for sslinfo cert chain printing bug - now all certs get printedikoz2016-03-151-2/+3
| |
| * New option: Add server certs to client chainikoz2016-03-084-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-2Maximilian Hils2016-03-161-1/+1
|\ \ | | | | | | Update modify_response_body.py
| * | Update modify_response_body.pycle10002016-03-151-1/+1
| | | | | | | | | fix typo
* | | Merge pull request #1030 from xhy940801/socksMaximilian Hils2016-03-162-1/+96
|\ \ \ | | | | | | | | Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS
| * | | Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKSyonder2016-03-152-1/+96
| | | |
* | | | Merge pull request #1019 from lilydjwg/masterThomas Kriechbaumer2016-03-155-0/+7
|\ \ \ \ | |_|/ / |/| | | add resolved IP address in "Details" tab
| * | | use "peer_address" instead of "sock_address"lilydjwg2016-03-155-7/+7
| | | |
| * | | fix tests for "sock_address"lilydjwg2016-03-141-0/+1
| | | |
| * | | add resolved IP address in "Details" tab依云2016-03-104-0/+6
| | | |
* | | | fix #1025, refs #983Maximilian Hils2016-03-121-1/+2
| | | |
* | | | Merge pull request #1027 from gzzhanghao/vscrollMaximilian Hils2016-03-122-3/+5
|\ \ \ \ | | | | | | | | | | [web] fix virtual scroll range
| * | | | [web] fix virtual scroll rangeJason2016-03-122-3/+5
| | | | |
* | | | | minor pyinstaller fixesMaximilian Hils2016-03-121-14/+17
| | | | |
* | | | | Merge pull request #1011 from MatthewShao/masterThomas Kriechbaumer2016-03-111-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix #1005
| * | | | | Add update_focus method in console/__init__.py.Matthew Shao2016-03-111-2/+5
| | | | | |
| * | | | | Fix #1005Matthew Shao2016-03-081-0/+2
| | | | | |
* | | | | | Merge pull request #1008 from dufferzafar/test-examplesMaximilian Hils2016-03-117-47/+123
|\ \ \ \ \ \ | | | | | | | | | | | | | | Some tests for examples
| * | | | | | Update contentview testShadab Zafar2016-03-111-4/+9
| | | | | | |
| * | | | | | Move har_extractor tests to the examples fileShadab Zafar2016-03-112-37/+24
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 19:56:23 +0000