Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix #903 | Maximilian Hils | 2016-01-30 | 1 | -1/+1 |
* | code formatting: fix whitespace issues | Thomas Kriechbaumer | 2016-01-27 | 75 | -63/+249 |
* | cleanup imports | Thomas Kriechbaumer | 2016-01-27 | 23 | -43/+20 |
* | Merge pull request #884 from dufferzafar/export | Maximilian Hils | 2016-01-26 | 3 | -34/+113 |
|\ | |||||
| * | Remove restrictions based on request content | Shadab Zafar | 2016-01-25 | 1 | -13/+0 |
| * | Copy as raw request | Shadab Zafar | 2016-01-13 | 3 | -0/+14 |
| * | Export/Copy request as python code | Shadab Zafar | 2016-01-13 | 3 | -1/+33 |
| * | Use signals.status_message for empty content | Shadab Zafar | 2016-01-13 | 1 | -1/+2 |
| * | Refactor copy_as_curl_command | Shadab Zafar | 2016-01-13 | 1 | -9/+7 |
| * | refactored export as curl to be 'E' to export and 'c' to as curl command | Marcelo Glezer | 2016-01-13 | 3 | -7/+27 |
| * | headers enumartion was failing in copy as curl and protocol was None when cop... | Marcelo Glezer | 2016-01-13 | 1 | -2/+2 |
| * | fixed TypeError: ask_save_overwrite() takes exactly 2 arguments (xxxxx given) | Marcelo Glezer | 2016-01-13 | 1 | -1/+1 |
| * | Was needlessly passing un-used parameters + clean up misspelling | Ryan Welton | 2016-01-13 | 1 | -17/+13 |
| * | Switch to single quotes | Ryan Welton | 2016-01-13 | 1 | -2/+2 |
| * | Add copy as curl command | Ryan Welton | 2016-01-13 | 3 | -17/+48 |
* | | Merge pull request #893 from dweinstein/sni-ignore | Maximilian Hils | 2016-01-26 | 4 | -58/+98 |
|\ \ | |||||
| * | | Add SNI ignore docs and have code match it | David Weinstein | 2016-01-26 | 2 | -11/+11 |
| * | | Include raw client hello in exception | David Weinstein | 2016-01-26 | 1 | -3/+3 |
| * | | remove TODO | David Weinstein | 2016-01-26 | 1 | -1/+1 |
| * | | Simplify check_ignore in _next_layer | David Weinstein | 2016-01-26 | 1 | -13/+12 |
| * | | Log exceptions parsing TlsClientHello in TlsLayer | David Weinstein | 2016-01-26 | 1 | -4/+7 |
| * | | remove client_tls property from TlsLayer | David Weinstein | 2016-01-26 | 1 | -4/+0 |
| * | | Move SNI ignore check into _next_layer | David Weinstein | 2016-01-26 | 1 | -28/+10 |
| * | | add TlsClientHello repr | David Weinstein | 2016-01-26 | 1 | -0/+5 |
| * | | Don't store client_tls state in root context | David Weinstein | 2016-01-25 | 1 | -5/+4 |
| * | | Add ignore based on TLS ClientHello SNI | David Weinstein | 2016-01-23 | 3 | -57/+113 |
* | | | Merge pull request #898 from lilydjwg/master | Maximilian Hils | 2016-01-26 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | [console] always show connection info in Details tab | 依云 | 2016-01-26 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #891 from ganguera/master | Maximilian Hils | 2016-01-22 | 3 | -7/+18 |
|\ \ | |||||
| * | | Added CLI argument to enable "follow flow list" mode | Guillem Anguera | 2016-01-22 | 3 | -7/+18 |
|/ / | |||||
* | | Merge pull request #879 from snemes/master | Maximilian Hils | 2016-01-18 | 4 | -6/+10 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/snemes/mitmproxy | Sandor Nemes | 2016-01-18 | 2 | -14/+20 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into master | Sandor Nemes | 2016-01-18 | 2 | -14/+20 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #881 from MatthewShao/Fix#846 | Maximilian Hils | 2016-01-18 | 2 | -14/+20 |
|\ \ \ \ | |||||
| * | | | | Update reloader.py | Matthew Shao | 2016-01-18 | 1 | -1/+0 |
| * | | | | Update reloader.py | Matthew Shao | 2016-01-18 | 1 | -1/+1 |
| * | | | | Use RegexMatchingEventHandler() instead. | MatthewShao | 2016-01-18 | 1 | -17/+7 |
| * | | | | Use PollingObserver() only on OS X. | Matthew Shao | 2016-01-14 | 1 | -6/+7 |
| * | | | | PollingObserver() fixed on Linux and OS X. | Matthew Shao | 2016-01-12 | 1 | -4/+6 |
| * | | | | Change Observer() to PollingObserver(). | MatthewShao | 2016-01-12 | 1 | -4/+3 |
| * | | | | Fix observer in same dir situation. | Matthew Shao | 2016-01-12 | 1 | -7/+8 |
| * | | | | Fix script reloader on OS X. | MatthewShao | 2016-01-12 | 2 | -8/+22 |
| | |_|/ | |/| | | |||||
| | * | | remove unnecessary source_address from proxy modes | Sandor Nemes | 2016-01-18 | 5 | -5/+1 |
| | |/ | |||||
| | * | Minor aesthetic fixes. | Sandor Nemes | 2016-01-18 | 3 | -7/+5 |
| | * | Merge branch 'master' into master | Sandor Nemes | 2016-01-17 | 8 | -26/+141 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #872 from bazzinotti/inline-tcp | Maximilian Hils | 2016-01-17 | 6 | -25/+100 |
|\ \ \ | |||||
| * | | | Add Inline Script Hooks to TCP mode | Michael J. Bazzinotti | 2016-01-10 | 6 | -25/+100 |
* | | | | Merge pull request #887 from felixonmars/pillow-31 | Thomas Kriechbaumer | 2016-01-14 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Allow Pillow 3.1 | Felix Yan | 2016-01-14 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #882 from tinius/sslstrip | Maximilian Hils | 2016-01-13 | 1 | -0/+40 |
|\ \ \ \ | |_|/ / |/| | | |