Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into print-bracket-fix | Jim Shaver | 2015-05-31 | 5 | -28/+64 |
|\ | | | | | | | | | | | | | | | Conflicts: examples/har_extractor.py examples/nonblocking.py examples/read_dumpfile libmproxy/web/app.py | ||||
| * | Add coding style check, reformat. | Aldo Cortesi | 2015-05-30 | 3 | -25/+61 |
| | | |||||
| * | + Use sys.platform.startswith("freebsd") instead of matching just freebsd10. | Mike C | 2015-04-27 | 2 | -4/+4 |
| | | | | | | | | + This means support for any freebsd version (note that I only tested 11-CURRENT and 9) | ||||
* | | Fixed print function to be inline with python 3 | Jim Shaver | 2015-05-29 | 1 | -2/+2 |
|/ | |||||
* | First-order integration of configargparser to add config file support | Aldo Cortesi | 2014-11-15 | 1 | -2/+2 |
| | |||||
* | fix bugs | Maximilian Hils | 2014-09-15 | 1 | -0/+3 |
| | |||||
* | Windows transparent proxy: allow specification of custom WinDivert filter rules | Maximilian Hils | 2014-08-30 | 1 | -11/+18 |
| | |||||
* | Windows transparent proxy: proxy local traffic | Maximilian Hils | 2014-08-30 | 1 | -81/+204 |
| | |||||
* | fix #270 | Maximilian Hils | 2014-08-10 | 4 | -11/+13 |
| | |||||
* | remove platform.setup | Maximilian Hils | 2014-08-08 | 2 | -5/+5 |
| | |||||
* | add transparent proxy mode on windows (docs still missing) | Maximilian Hils | 2014-07-16 | 2 | -3/+268 |
| | |||||
* | only support FreeBSD 10+ | Zack B | 2014-07-01 | 2 | -2/+2 |
| | |||||
* | add resolver for FreeBSD using pfctl | Zack B | 2014-07-01 | 3 | -1/+14 |
| | |||||
* | Silence pyflakes | Aldo Cortesi | 2014-01-19 | 1 | -1/+1 |
| | | | | And pick up one bug as a consequence. | ||||
* | Revert "Use lsof instead of pfctl to find target host on OSX in transparent ↵ | Aldo Cortesi | 2013-06-16 | 2 | -9/+8 |
| | | | | | | mode." This reverts commit ffeede9b39c8d269766fd56d02eb7e78d8d13bb2. | ||||
* | Use lsof instead of pfctl to find target host on OSX in transparent mode. | Ivaylo Popov | 2013-05-27 | 2 | -8/+9 |
| | |||||
* | Better error handling for transparent mode remote address resolution. | Aldo Cortesi | 2013-01-01 | 1 | -1/+4 |
| | |||||
* | First draft of OSX transparent proxy mode. | Aldo Cortesi | 2013-01-01 | 2 | -97/+30 |
| | |||||
* | Stub out ctypes structures for OSX transparent mode. | Aldo Cortesi | 2012-09-17 | 3 | -40/+89 |
| | |||||
* | Stub out a transparent resolver for OSX. | Aldo Cortesi | 2012-06-30 | 2 | -1/+57 |
| | |||||
* | Add transparent mode platform module for Linux. | Aldo Cortesi | 2012-06-26 | 2 | -0/+18 |