aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Improve options UXUjjwal Verma2017-08-072-2/+160
* | | | | Merge pull request #2492 from mhils/addon-containsMaximilian Hils2017-08-051-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | gracefully handle errors during script loadMaximilian Hils2017-08-051-2/+3
| |/ / /
* | | | re-add --http2 switchMaximilian Hils2017-08-051-0/+1
* | | | Merge pull request #2494 from ujjwal96/intercept-toggleThomas Kriechbaumer2017-08-042-3/+5
|\ \ \ \
| * | | | Improve intercept toggleUjjwal Verma2017-08-022-3/+5
| |/ / /
* | | | Revert "Remove promotion to raw TCP based on heuristics"Maximilian Hils2017-08-031-1/+10
* | | | improve docstring for rawtcpMaximilian Hils2017-08-031-3/+4
* | | | update for pyasn1 0.3Ujjwal Verma2017-08-021-5/+3
* | | | Merge pull request #2490 from mitmproxy/issue-2334Maximilian Hils2017-08-011-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Update proxyauth.pyMaximilian Hils2017-08-011-1/+1
* | | | fix mitmproxy invocationMaximilian Hils2017-08-011-1/+1
|/ / /
* | | add LogEntry.__eq__Maximilian Hils2017-08-011-0/+5
* | | Merge pull request #2487 from mhils/no-option-processingMaximilian Hils2017-08-016-10/+19
|\ \ \ | |_|/ |/| |
| * | remove OptManager._processedMaximilian Hils2017-07-316-10/+19
* | | Fix minor typing mistake.Matthew Shao2017-07-311-1/+1
* | | Merge pull request #2484 from mhils/options-into-own-addonMaximilian Hils2017-07-3111-85/+119
|\| | | |/ |/|
| * minor fixesMaximilian Hils2017-07-302-5/+5
| * move isatty check to a better placeMaximilian Hils2017-07-302-6/+5
| * fix tool-specific cmdlineMaximilian Hils2017-07-302-19/+28
| * disentangle ProxyServer and Master classes.Maximilian Hils2017-07-309-48/+73
| * move web options into their own addonMaximilian Hils2017-07-293-19/+20
* | Merge pull request #2485 from mhils/silent-option-redeclarationMaximilian Hils2017-07-301-1/+12
|\ \
| * | make option redeclaration silent if signature is the sameMaximilian Hils2017-07-301-1/+12
* | | Merge pull request #2482 from mhils/pure-script-loadMaximilian Hils2017-07-301-17/+15
|\ \ \ | |/ / |/| |
| * | make load_script pureMaximilian Hils2017-07-301-17/+15
| |/
* | Merge pull request #2483 from mhils/ignore-imports-with-hook-namesMaximilian Hils2017-07-301-3/+11
|\ \
| * | gracefully ignore imports with hook namesMaximilian Hils2017-07-291-3/+11
| |/
* | fix type hints for mitmproxy.ctxMaximilian Hils2017-07-291-3/+3
* | add option type hintsMaximilian Hils2017-07-291-0/+79
* | add OptManager.itemsMaximilian Hils2017-07-291-0/+3
|/
* Merge pull request #2452 from mattweidner/add_intercept_toggleMaximilian Hils2017-07-296-1/+19
|\
| * Changed statusbar indicator to 'X' inside the intercept filter bracketsMatt Weidner2017-07-271-2/+2
| * Fixed boolean evaluation syntax inconsistencyMatt Weidner2017-07-271-1/+1
| * Fixed indentationMatt Weidner2017-07-271-2/+2
| * Add intercetp toggle feature.Matt Weidner2017-07-276-1/+19
* | Merge pull request #2480 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-295-6/+20
|\ \
| * | Fix lint error.Matthew Shao2017-07-281-1/+1
| * | Improve verbosity options.Matthew Shao2017-07-285-6/+20
| |/
* | Merge pull request #2471 from ujjwal96/traceback-fixMaximilian Hils2017-07-291-1/+1
|\ \ | |/ |/|
| * fixed addon errorUjjwal Verma2017-07-261-1/+1
* | Merge pull request #2460 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-272-2/+11
|\ \
| * | [web] Minor Fix for backend.Matthew Shao2017-07-272-13/+4
| * | [web] Fix conflict.Matthew Shao2017-07-262-12/+8
| * | [web] Load dumped options at start up.Matthew Shao2017-07-261-0/+6
| * | [web] Update POST /options/dump API in backend.Matthew Shao2017-07-261-9/+3
| * | [web] Add /options/dump API to backend.Matthew Shao2017-07-241-1/+18
| * | [web] Update OptManager.save() to suit the need of mitmweb.Matthew Shao2017-07-241-5/+11
* | | add comment explaining upstream connect logicMaximilian Hils2017-07-261-0/+2
* | | Allow http_connect to create a response for CONNECT request so that connectio...Biping Meng2017-07-261-10/+11