aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
...
* | | | fix lintMaximilian Hils2019-11-161-1/+1
* | | | minor type fixesMaximilian Hils2019-11-161-4/+6
* | | | Merge branch 'master' into masterMaximilian Hils2019-11-1612-153/+237
|\ \ \ \
| * \ \ \ Merge pull request #3705 from mhils/issue-3469Maximilian Hils2019-11-162-29/+45
| |\ \ \ \
| | * | | | tests++Maximilian Hils2019-11-151-1/+0
| | * | | | fix #3469Maximilian Hils2019-11-152-29/+46
| * | | | | Merge pull request #3700 from Jessonsotoventura/confirm_quitMaximilian Hils2019-11-161-1/+1
| |\ \ \ \ \
| | * | | | | used getattr to select exitJesson Soto Ventura2019-11-151-5/+1
| | * | | | | ctrl-c should prompt for an exitJesson Soto Ventura2019-11-141-1/+5
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #3448 from cript0nauta/masterMaximilian Hils2019-11-161-32/+49
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | test coverage++Maximilian Hils2019-11-151-0/+1
| | * | | | improve curl/httpie exportMaximilian Hils2019-11-151-33/+40
| | * | | | Merge remote-tracking branch 'origin/master' into pr-3448Maximilian Hils2019-11-1571-520/+1060
| | |\ \ \ \
| | * | | | | Fix flake8 warning in curl_commandMatías Lang2019-01-141-4/+1
| | * | | | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMatías Lang2019-01-1311-17/+18
| | |\ \ \ \ \
| | * | | | | | Refactor curl_command and httpie_commandMatías Lang2019-01-131-11/+10
| | * | | | | | Fix command injection when exporting to httpieMatías Lang2019-01-131-8/+12
| | * | | | | | Fix command injection when exporting to curlMatías Lang2019-01-131-9/+16
| * | | | | | | Merge pull request #3420 from rjt-gupta/multipart-fixMaximilian Hils2019-11-155-17/+73
| |\ \ \ \ \ \ \
| | * | | | | | | separate editorsrjt-gupta2019-02-063-11/+23
| | * | | | | | | multipart encoder and testsrjt-gupta2019-02-062-11/+46
| | * | | | | | | multipart-fixrjt-gupta2019-02-062-3/+12
| * | | | | | | | Merge pull request #3522 from peter-way/masterMaximilian Hils2019-11-151-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'master' into masterMaximilian Hils2019-11-1567-457/+973
| | |\ \ \ \ \ \ \
| | * | | | | | | | Update serverplayback.pyMaximilian Hils2019-07-171-4/+1
| | * | | | | | | | Use 'host_header' instead of 'host', when calculating 'HTTPRequest' hash in t...peter-way2019-04-151-1/+4
| * | | | | | | | | Merge pull request #3612 from ccssrryy/fix-dup-respMaximilian Hils2019-11-151-5/+8
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | fix duplicate error responsecs2019-08-091-5/+8
| | |/ / / / / / /
| * | | | | | | | Merge pull request #3425 from rjt-gupta/external-viewerMaximilian Hils2019-11-151-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | remove superfluous optionMaximilian Hils2019-11-151-5/+0
| | * | | | | | | option addedrjt-gupta2019-01-071-0/+5
| | * | | | | | | external-viewer-fixrjt-gupta2018-12-171-2/+2
| * | | | | | | | allow server replay functionality to run on a different portJurriaan Bremer2019-11-151-1/+10
| * | | | | | | | improve flowfilterMaximilian Hils2019-11-151-64/+48
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Adding raw_request and raw_response to exportMichael McKeirnan2019-11-161-4/+22
* | | | | | | | Adding export raw http responseMichael McKeirnan2019-11-151-2/+14
|/ / / / / / /
* | | | | | | Merge pull request #3697 from ylmrx/issue_3639-yml_extension_allowedMaximilian Hils2019-11-151-3/+2
|\ \ \ \ \ \ \
| * | | | | | | simplify option file loadingMaximilian Hils2019-11-141-7/+5
| * | | | | | | adding config.yml as an allowed config filenameYoann L2019-11-141-6/+7
* | | | | | | | Fixes #3694Yoann L2019-11-141-6/+12
|/ / / / / / /
* | | | | | | Merge pull request #3691 from mhils/sans-io-adjustmentsMaximilian Hils2019-11-1236-161/+169
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | update mypyMaximilian Hils2019-11-1236-142/+148
| * | | | | | minor improvements and sans-io adjustmentsMaximilian Hils2019-11-114-31/+33
* | | | | | | Merge pull request #3679 from tomlabaude/pf_ipv6Maximilian Hils2019-11-071-2/+15
|\ \ \ \ \ \ \
| * | | | | | | Fixed lintTom2019-11-051-4/+4
| * | | | | | | Added support for IPv6 in pf.py for macOSTom2019-11-051-2/+15
| |/ / / / / /
* / / / / / / make duration formatting more forgivingMaximilian Hils2019-11-071-1/+3
|/ / / / / /
* | | | | | Merge pull request #3675 from ylmrx/crash_on_replay-3559Maximilian Hils2019-11-041-2/+3
|\ \ \ \ \ \
| * | | | | | take no action if on `Host` if `:authority` isn't foundYoann L2019-11-041-2/+3
| * | | | | | fixes #3559Yoann L2019-10-251-1/+1