aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #3692 from mhils/tls13Maximilian Hils2020-04-0320-386/+440
|\ \ \ \ \ | |/ / / / |/| | | | Update cryptography, enable TLS 1.3
| * | | | temporarily fix key logging for OpenSSL 1.1.1fMaximilian Hils2020-04-031-5/+22
| | | | |
| * | | | fix compatibility with Python 3.8 on WindowsMaximilian Hils2020-04-031-0/+8
| | | | |
| * | | | fix tls test on WindowsMaximilian Hils2020-04-031-0/+4
| | | | |
| * | | | bump minimum cryptography versionMaximilian Hils2020-04-031-1/+1
| | | | |
| * | | | use OpenSSL's hostname validationMaximilian Hils2019-11-2315-371/+384
| | | | |
| * | | | update cryptographyMaximilian Hils2019-11-234-10/+22
| | | | |
* | | | | Merge pull request #3882 from mhils/pin-mypyMaximilian Hils2020-04-034-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Update mypy and pin version
| * | | | | update mypy and pin versionMaximilian Hils2020-04-024-4/+4
| | | | | |
* | | | | | Merge pull request #3881 from Prinzhorn/serverconnectMaximilian Hils2020-04-021-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Only emit "serverconnect" after successfully connecting
| * | | | | Only emit "serverconnect" after successfully connectingAlexander Prinzhorn2020-04-021-2/+2
|/ / / / /
* | | | | Merge pull request #3849 from sarthak212/errorhandlingMaximilian Hils2020-04-023-5/+40
|\ \ \ \ \ | | | | | | | | | | | | Fix:Addon OptionsError is neither logged, nor does it stop mitmproxy
| * | | | | Changesroot2020-03-311-10/+4
| | | | | |
| * | | | | remove whitespaceroot2020-03-111-1/+1
| | | | | |
| * | | | | test case option errorroot2020-03-112-0/+38
| | | | | |
| * | | | | test resolveroot2020-03-111-1/+1
| | | | | |
| * | | | | Options Exception in scriptroot2020-03-111-5/+8
| | | | | |
* | | | | | Merge pull request #3839 from naivekun/fix_for_issue_3833Maximilian Hils2020-03-302-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix for issue 3833
| * | | | | | remove duplicate testMaximilian Hils2020-03-091-4/+0
| | | | | | |
| * | | | | | extend tests for headers.replace()naivekun2020-03-021-0/+6
| | | | | | |
| * | | | | | fix #3833naivekun2020-03-021-1/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3870 from naivekun/update_documentMaximilian Hils2020-03-301-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix document error
| * | | | | | fix document errornaivekun2020-03-251-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3875 from sarthak212/docsdeprecatedMaximilian Hils2020-03-301-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | c is deprecated
| * | | | c is deprecatedroot2020-03-311-1/+1
|/ / / /
* / / / finish FIXME: move open_browser() to addon/browser (#3832)naivekun2020-03-083-37/+42
|/ / /
* | | Merge pull request #3841 from mhils/sans-io-adjustmentsMaximilian Hils2020-02-282-4/+10
|\ \ \ | | | | | | | | Minor code style improvements, sync sans-io changes
| * | | minor code style improvements, sync sans-io changesMaximilian Hils2020-02-282-4/+10
| | | |
* | | | Fix binary builds (#3840)Maximilian Hils2020-02-281-0/+7
| | | | | | | | | | | | See https://github.com/pypa/setuptools/issues/1963 for details.
* | | | Merge pull request #3826 from BlownSnail/fixingMaximilian Hils2020-02-261-1/+1
|\ \ \ \ | | | | | | | | | | Fix wrong behavior of --allow-hosts options
| * | | | Fix wrong behavior of --allow-hosts optionsBlown_Snail2020-02-231-1/+1
| |/ / /
* | | | Merge pull request #3829 from meetmangukiya/rm-node-scssMaximilian Hils2020-02-2680-1228/+5121
|\ \ \ \ | |/ / / |/| | | Remove yarn/npm from docs
| * | | Remove yarn/npm from docsMeet Mangukiya2020-02-2580-1228/+5121
| | | | | | | | | | | | | | | | Closes https://github.com/mitmproxy/mitmproxy/issues/3716
* | | | update compiled mitmweb assets, fix #3822Maximilian Hils2020-02-212-2/+2
| | | |
* | | | Update README.mdMaximilian Hils2020-02-211-0/+1
|/ / / | | | | | | mention mitmweb assets, refs #3822
* | | Merge pull request #3821 from axmo12/masterThomas Kriechbaumer2020-02-161-8/+8
|\ \ \ | | | | | | | | onboardingapp: Fix bugs 3397,3034 & link pems properly
| * | | onboardingapp: Fix bugs 3397,3034 & link pems properlyAxel Morawietz2020-02-151-8/+8
|/ / / | | | | | | | | | | | | | | | This change will make sure that a user can click on a link to install the CAs even if displaying the logos fails.
* | | Merge pull request #3811 from rohfle/rohfle-http2-send-all-stream-resetsThomas Kriechbaumer2020-02-152-7/+71
|\ \ \ | | | | | | | | http2: send all stream reset types to other connection
| * | | http2: added test for all stream reset typesRohan Fletcher2020-02-121-0/+65
| | | |
| * | | http2: send all stream reset types to other connectionRohan Fletcher2020-02-061-7/+6
| | | |
* | | | Merge pull request #3815 from Kriechi/fix-3780Thomas Kriechbaumer2020-02-092-9/+26
|\ \ \ \ | | | | | | | | | | fix #3780
| * | | | fix #3780Thomas Kriechbaumer2020-02-082-9/+26
| | | | |
* | | | | Merge pull request #3814 from 2NuFyeat4PZt/patch-1Thomas Kriechbaumer2020-02-081-0/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Update concepts-filters.md
| * | | | Update concepts-filters.md2NuFyeat4PZt2020-02-071-0/+5
|/ / / / | | | | | | | | Provide a working example for the ~m filter
* | | | Merge pull request #3809 from mhils/issue-3801Maximilian Hils2020-02-041-1/+8
|\ \ \ \ | | | | | | | | | | fix #3801
| * | | | fix #3801Maximilian Hils2020-02-041-1/+8
|/ / / /
* | | | Merge pull request #3801 from mitmproxy/issue-3794Maximilian Hils2020-02-021-2/+3
|\ \ \ \ | | | | | | | | | | Improve command detection heuristics
| * | | | improve command detection heuristicsMaximilian Hils2020-01-271-2/+3
| | | | | | | | | | | | | | | this fixes #3794
* | | | | Merge pull request #3798 from typoon/issue-3797Maximilian Hils2020-01-271-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix for issue 3797
| * | | | | Fix for issue 3797Gilgamesh2020-01-241-2/+1
| | |_|/ / | |/| | |