aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cleanup importsThomas Kriechbaumer2016-01-2723-43/+20
* Merge pull request #884 from dufferzafar/exportMaximilian Hils2016-01-263-34/+113
|\
| * Remove restrictions based on request contentShadab Zafar2016-01-251-13/+0
| * Copy as raw requestShadab Zafar2016-01-133-0/+14
| * Export/Copy request as python codeShadab Zafar2016-01-133-1/+33
| * Use signals.status_message for empty contentShadab Zafar2016-01-131-1/+2
| * Refactor copy_as_curl_commandShadab Zafar2016-01-131-9/+7
| * refactored export as curl to be 'E' to export and 'c' to as curl commandMarcelo Glezer2016-01-133-7/+27
| * headers enumartion was failing in copy as curl and protocol was None when cop...Marcelo Glezer2016-01-131-2/+2
| * fixed TypeError: ask_save_overwrite() takes exactly 2 arguments (xxxxx given)Marcelo Glezer2016-01-131-1/+1
| * Was needlessly passing un-used parameters + clean up misspellingRyan Welton2016-01-131-17/+13
| * Switch to single quotesRyan Welton2016-01-131-2/+2
| * Add copy as curl commandRyan Welton2016-01-133-17/+48
* | Merge pull request #893 from dweinstein/sni-ignoreMaximilian Hils2016-01-264-58/+98
|\ \
| * | Add SNI ignore docs and have code match itDavid Weinstein2016-01-262-11/+11
| * | Include raw client hello in exceptionDavid Weinstein2016-01-261-3/+3
| * | remove TODODavid Weinstein2016-01-261-1/+1
| * | Simplify check_ignore in _next_layerDavid Weinstein2016-01-261-13/+12
| * | Log exceptions parsing TlsClientHello in TlsLayerDavid Weinstein2016-01-261-4/+7
| * | remove client_tls property from TlsLayerDavid Weinstein2016-01-261-4/+0
| * | Move SNI ignore check into _next_layerDavid Weinstein2016-01-261-28/+10
| * | add TlsClientHello reprDavid Weinstein2016-01-261-0/+5
| * | Don't store client_tls state in root contextDavid Weinstein2016-01-251-5/+4
| * | Add ignore based on TLS ClientHello SNIDavid Weinstein2016-01-233-57/+113
* | | Merge pull request #898 from lilydjwg/masterMaximilian Hils2016-01-261-2/+2
|\ \ \ | |/ / |/| |
| * | [console] always show connection info in Details tab依云2016-01-261-2/+2
|/ /
* | Merge pull request #891 from ganguera/masterMaximilian Hils2016-01-223-7/+18
|\ \
| * | Added CLI argument to enable "follow flow list" modeGuillem Anguera2016-01-223-7/+18
|/ /
* | Merge pull request #879 from snemes/masterMaximilian Hils2016-01-184-6/+10
|\ \
| * \ Merge branch 'master' of https://github.com/snemes/mitmproxySandor Nemes2016-01-182-14/+20
| |\ \
| | * \ Merge branch 'master' into masterSandor Nemes2016-01-182-14/+20
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #881 from MatthewShao/Fix#846Maximilian Hils2016-01-182-14/+20
|\ \ \ \
| * | | | Update reloader.pyMatthew Shao2016-01-181-1/+0
| * | | | Update reloader.pyMatthew Shao2016-01-181-1/+1
| * | | | Use RegexMatchingEventHandler() instead.MatthewShao2016-01-181-17/+7
| * | | | Use PollingObserver() only on OS X.Matthew Shao2016-01-141-6/+7
| * | | | PollingObserver() fixed on Linux and OS X.Matthew Shao2016-01-121-4/+6
| * | | | Change Observer() to PollingObserver().MatthewShao2016-01-121-4/+3
| * | | | Fix observer in same dir situation.Matthew Shao2016-01-121-7/+8
| * | | | Fix script reloader on OS X.MatthewShao2016-01-122-8/+22
| | |_|/ | |/| |
| | * | remove unnecessary source_address from proxy modesSandor Nemes2016-01-185-5/+1
| | |/
| | * Minor aesthetic fixes.Sandor Nemes2016-01-183-7/+5
| | * Merge branch 'master' into masterSandor Nemes2016-01-178-26/+141
| | |\ | |_|/ |/| |
* | | Merge pull request #872 from bazzinotti/inline-tcpMaximilian Hils2016-01-176-25/+100
|\ \ \
| * | | Add Inline Script Hooks to TCP modeMichael J. Bazzinotti2016-01-106-25/+100
* | | | Merge pull request #887 from felixonmars/pillow-31Thomas Kriechbaumer2016-01-141-1/+1
|\ \ \ \
| * | | | Allow Pillow 3.1Felix Yan2016-01-141-1/+1
|/ / / /
* | | | Merge pull request #882 from tinius/sslstripMaximilian Hils2016-01-131-0/+40
|\ \ \ \ | |_|/ / |/| | |
| * | | no longer strips Accept-Encoding as mitmproxy can handle compressionNiko Kommenda2016-01-121-1/+0
| * | | added sslstrip to inline script examplesNiko Kommenda2016-01-121-0/+41
|/ / /