aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* minor sans-io adjustmentsMaximilian Hils2020-04-052-2/+3
|
* Merge pull request #3899 from mhils/dont-add-host-headerMaximilian Hils2020-04-042-22/+1
|\ | | | | Don't force host header on outgoing requests
| * don't force host header on outgoing requestsMaximilian Hils2020-04-042-22/+1
|/
* Merge pull request #3898 from Kriechi/websocket-docsThomas Kriechbaumer2020-04-0410-115/+155
|\ | | | | improve scripting docs
| * improve scripting docsThomas Kriechbaumer2020-04-0410-115/+155
| |
* | Merge pull request #3897 from mhils/sans-io-adjustmentsMaximilian Hils2020-04-042-14/+21
|\ \ | |/ |/| Sync sans-io adjustments
| * sync sans-io adjustmentsMaximilian Hils2020-04-042-14/+21
|/
* Merge pull request #3892 from mhils/update-dependenciesMaximilian Hils2020-04-034-18/+14
|\ | | | | Update Dependencies
| * downgrade to py37 for pyinstaller buildsMaximilian Hils2020-04-031-2/+2
| |
| * ci: py37 -> py38Maximilian Hils2020-04-031-11/+7
| |
| * update installbuilderMaximilian Hils2020-04-031-3/+3
| |
| * fix pyinstallerMaximilian Hils2020-04-031-1/+1
| |
| * bump dependenciesMaximilian Hils2020-04-032-7/+7
|/
* lint!Maximilian Hils2020-04-031-1/+0
|
* fix nonblocking exampleMaximilian Hils2020-04-031-3/+3
| | | this fixes #3877
* Merge pull request #3889 from oxr463/patch-1Maximilian Hils2020-04-031-0/+2
|\ | | | | Clarify developer documentation for mitmweb
| * Clarify developer documentation for mitmwebLucas Ramage2020-04-031-0/+2
| | | | | | Bug: https://github.com/mitmproxy/mitmproxy/issues/3888
* | 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