Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #898 from lilydjwg/master | Maximilian Hils | 2016-01-26 | 1 | -2/+2 |
|\ | | | | | [console] always show connection info in Details tab | ||||
| * | [console] always show connection info in Details tab | 依云 | 2016-01-26 | 1 | -2/+2 |
|/ | | | | | | | Connections become false values when it's finished. Check if it's None when trying to show address info. Fixes #886. | ||||
* | Merge pull request #891 from ganguera/master | Maximilian Hils | 2016-01-22 | 3 | -7/+18 |
|\ | | | | | Added CLI argument to enable "follow flow list" mode | ||||
| * | 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 |
|\ | | | | | Fixed a problem with the bind address not being used as the source address on outgoing TCP packets | ||||
| * | 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 |
|\ \ \ | | | | | | | | | Fix #846 | ||||
| * | | | 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 "tcp_message" Inline Script Hook | ||||
| * | | | 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 | ||||
| * | | | | Allow Pillow 3.1 | Felix Yan | 2016-01-14 | 1 | -1/+1 |
|/ / / / | | | | | | | | | Tested with Pillow 3.1.0, all tests passed and the functionality is working correctly here. | ||||
* | | | | Merge pull request #882 from tinius/sslstrip | Maximilian Hils | 2016-01-13 | 1 | -0/+40 |
|\ \ \ \ | |_|/ / |/| | | | added sslstrip to inline script examples | ||||
| * | | | no longer strips Accept-Encoding as mitmproxy can handle compression | Niko Kommenda | 2016-01-12 | 1 | -1/+0 |
| | | | | |||||
| * | | | added sslstrip to inline script examples | Niko Kommenda | 2016-01-12 | 1 | -0/+41 |
|/ / / | |||||
| | * | Merge branch 'master' into master | Sandor Nemes | 2016-01-13 | 5 | -18/+29 |
| | |\ | |_|/ |/| | | |||||
* | | | remove code duplication | Thomas Kriechbaumer | 2016-01-10 | 1 | -6/+6 |
| | | | |||||
* | | | Support writing to outfile from mitmweb | Chris Czub | 2016-01-10 | 3 | -10/+21 |
| | | | |||||
* | | | Merge pull request #878 from warting/patch-1 | Maximilian Hils | 2016-01-08 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Update redirect_requests.py | ||||
| * | | | Update redirect_requests.py | Stefan Wärting | 2016-01-08 | 1 | -2/+2 |
|/ / / | | | | | | | replace http version with "HTTP/1.1" | ||||
| | * | Fixed a problem with the bind address not being used as the source address ↵ | Sandor Nemes | 2016-01-08 | 7 | -7/+17 |
| |/ |/| | | | | | on outgoing TCP packets | ||||
* | | fix #659 | Maximilian Hils | 2016-01-02 | 2 | -4/+10 |
|/ | |||||
* | clientcert tests: fix whitespace | Michael J. Bazzinotti | 2015-12-29 | 1 | -0/+2 |
| | |||||
* | Merge pull request #870 from bazzinotti/master | Maximilian Hils | 2015-12-29 | 7 | -21/+48 |
|\ | | | | | [docs/libmproxy/test] Support single client-side cert file | ||||
| * | client-cert: Simplify and cleanup | Michael J. Bazzinotti | 2015-12-29 | 4 | -22/+20 |
| | | | | | | | | | | | | simplify the error message when cert path does not exist. During tests, reset the clientcerts proxy config setting to None Remove now-unused clientcerts code from class ProxTestBase | ||||
| * | [docs/libmproxy/test] Support single client-side cert file as argument to | Michael J. Bazzinotti | 2015-12-28 | 6 | -13/+42 |
|/ | | | | --client-certs | ||||
* | Merge pull request #857 from jwilk/spelling | Maximilian Hils | 2015-12-12 | 3 | -4/+4 |
|\ | | | | | docs: fix typos | ||||
| * | docs: fix typos | Jakub Wilk | 2015-12-12 | 3 | -4/+4 |
| | | |||||
* | | Merge pull request #855 from jvillacorta/master | Maximilian Hils | 2015-12-11 | 1 | -1/+1 |
|\ \ | |/ |/| | Add default ciphers to avoid issue with iOS9 App Transport Security | ||||
| * | Add default ciphers to avoid issue with iOS9 App Transport Security | Jorge Villacorta | 2015-12-11 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #853 from dweinstein/warnings-to-stderr | Maximilian Hils | 2015-12-10 | 1 | -1/+2 |
|\ | | | | | TLS verification warnings write to stderr | ||||
| * | TLS verification warnings write to stderr | David Weinstein | 2015-12-10 | 1 | -1/+2 |
|/ | |||||
* | Merge commit '5db6275' | Aldo Cortesi | 2015-12-04 | 1 | -0/+13 |
|\ | |||||
| * | Changelog | Aldo Cortesi | 2015-12-04 | 1 | -0/+13 |
| | | |||||
* | | setup.py: document that we don't want to use '~=' | Maximilian Hils | 2015-12-03 | 1 | -1/+3 |
| | | |||||
* | | use latest netlib version for snapshots | Maximilian Hils | 2015-12-03 | 2 | -2/+2 |
| | | |||||
* | | remove docs directory from sdist | Maximilian Hils | 2015-12-03 | 1 | -0/+1 |
|/ | |||||
* | bump version | Maximilian Hils | 2015-12-03 | 2 | -26/+28 |
| | |||||
* | use version specifiers compatible with old setuptools releases | Maximilian Hils | 2015-12-03 | 1 | -22/+21 |
| |