Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #300 from zbrdge/freebsd-platform | Maximilian Hils | 2014-07-03 | 3 | -1/+14 |
|\ | | | | | Freebsd 10 platform | ||||
| * | 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 |
| | | |||||
* | | Merge pull request #286 from m0sth8/remove_global_should_exit | Maximilian Hils | 2014-07-03 | 3 | -16/+14 |
|\ \ | |/ |/| | Remove global should_exit and fix tests | ||||
| * | Remove global should_exit and fix tests | Vyacheslav Bakhmutov | 2014-06-13 | 3 | -16/+14 |
| | | |||||
* | | fix ProxyError inheritance | Maximilian Hils | 2014-06-25 | 1 | -6/+4 |
| | | |||||
* | | expose sockname | Maximilian Hils | 2014-06-25 | 2 | -2/+5 |
| | | |||||
* | | add support for certificate chains, refs #174 | Maximilian Hils | 2014-05-21 | 2 | -3/+6 |
|/ | |||||
* | fix up error messages | Maximilian Hils | 2014-05-15 | 3 | -76/+79 |
| | |||||
* | fix #267 | Maximilian Hils | 2014-05-15 | 1 | -1/+3 |
| | |||||
* | re-use cert creation from netlib in handle_sni, fix #272 | Maximilian Hils | 2014-05-15 | 1 | -13/+22 |
| | |||||
* | - changed license to MIT, as it is more easily integrated into the mitmproxy ↵ | davidpshaw | 2014-05-06 | 6 | -69/+105 |
| | | | | project | ||||
* | - working WBXML parser | David Shaw | 2014-05-06 | 9 | -0/+1200 |
| | |||||
* | Merge pull request #269 from shvar/master | Maximilian Hils | 2014-04-29 | 1 | -1/+3 |
|\ | | | | | init ProxyConfig.certstore with custom certs | ||||
| * | fix default certs | Eli Shvartsman | 2014-04-29 | 1 | -1/+1 |
| | | |||||
| * | init ProxyConfig.certstore with custom certs | Eli Shvartsman | 2014-04-29 | 1 | -0/+2 |
| | | |||||
* | | Update server.py | Eli Shvartsman | 2014-04-29 | 1 | -1/+1 |
|/ | | | | | We should ask for upstream cert only if there is: 1) no no_upstream_cert option specified 2) ssl connection to server is established | ||||
* | Fix proxy options | Aldo Cortesi | 2014-04-12 | 1 | -2/+2 |
| | |||||
* | fix issue #260 | Maximilian Hils | 2014-04-07 | 1 | -1/+3 |
| | |||||
* | beef up error messages | Maximilian Hils | 2014-03-26 | 1 | -1/+1 |
| | |||||
* | add requests to requrements, improve error logging | Maximilian Hils | 2014-03-19 | 1 | -1/+4 |
| | |||||
* | fix minor version string | Maximilian Hils | 2014-03-19 | 1 | -1/+1 |
| | |||||
* | fix display bugs (fixes #243) | Maximilian Hils | 2014-03-18 | 2 | -2/+7 |
| | |||||
* | forward proxy -> upstream proxy | Maximilian Hils | 2014-03-14 | 3 | -12/+12 |
| | |||||
* | remove debug switch | Maximilian Hils | 2014-03-13 | 1 | -5/+1 |
| | |||||
* | order command line options, add disting proxy option group | Maximilian Hils | 2014-03-13 | 2 | -64/+70 |
| | |||||
* | adjust command line docs, fix log typo | Maximilian Hils | 2014-03-13 | 2 | -3/+3 |
| | |||||
* | adjust tests, fix option handling | Maximilian Hils | 2014-03-13 | 2 | -2/+1 |
| | |||||
* | add support for log levels | Maximilian Hils | 2014-03-13 | 10 | -60/+65 |
| | |||||
* | add -d switch to mitmdump to compensate for old verbosity functionality | Maximilian Hils | 2014-03-12 | 3 | -15/+18 |
| | |||||
* | restrict -e to mitmproxy only (not mitmdump) | Maximilian Hils | 2014-03-12 | 4 | -14/+7 |
| | |||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-03-11 | 2 | -24/+36 |
|\ | |||||
| * | Certificate forwarding. | Aldo Cortesi | 2014-03-11 | 2 | -24/+36 |
| | | |||||
* | | fix temporary server change, coverage++ | Maximilian Hils | 2014-03-11 | 3 | -15/+14 |
|/ | |||||
* | always use relative imports, fix status bar bug | Maximilian Hils | 2014-03-10 | 27 | -30/+54 |
| | |||||
* | split up protocol\__init__.py | Maximilian Hils | 2014-03-10 | 8 | -116/+113 |
| | |||||
* | Merge branch 'absolutely_relative_proxying' | Maximilian Hils | 2014-03-10 | 10 | -172/+199 |
|\ | |||||
| * | update docs, fix #215 | Maximilian Hils | 2014-03-10 | 4 | -13/+15 |
| | | |||||
| * | add advanced proxying options, add SSL-terminating capability to mitmproxy | Maximilian Hils | 2014-03-10 | 8 | -117/+140 |
| | | |||||
| * | lay the foundations for --(in|out)(abs|rel) command line switches, as ↵ | Maximilian Hils | 2014-03-10 | 4 | -55/+57 |
| | | | | | | | | proposed in https://groups.google.com/forum/#!topic/mitmproxy/nApno2TXS0c | ||||
* | | Merge pull request #232 from benwa/patch-2 | Aldo Cortesi | 2014-03-10 | 1 | -6/+0 |
|\ \ | |/ |/| | Update layout.html | ||||
| * | Update layout.html | Bennett Blodinger | 2014-03-08 | 1 | -6/+0 |
| | | | | | | Remove unnecessary menu button on mobile | ||||
* | | fix mentions of CONTENT_MISSING in libmproxy.console | Maximilian Hils | 2014-03-09 | 2 | -5/+7 |
| | | |||||
* | | finish proxy.py split up | Maximilian Hils | 2014-03-09 | 13 | -256/+247 |
| | | |||||
* | | split up proxy.py | Maximilian Hils | 2014-03-09 | 9 | -178/+193 |
|/ | |||||
* | fix windows tests, include improvements from 0.10.1 | Maximilian Hils | 2014-03-08 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-03-08 | 7 | -104/+177 |
|\ | |||||
| * | Revert to old cert names, use a subdir for test conf dir. | Aldo Cortesi | 2014-03-07 | 1 | -3/+3 |
| | | |||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-03-07 | 1 | -1/+0 |
| |\ | |||||
| | * | remove redundant codeline | Sergey Chipiga | 2014-03-05 | 1 | -1/+0 |
| | | |