Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix parameter naming | Maximilian Hils | 2014-07-14 | 1 | -5/+5 |
| | |||||
* | make include_content=False work by passing this on to netlib's ↵ | Brad Peabody | 2014-07-12 | 1 | -3/+2 |
| | | | | http.read_response | ||||
* | fix command line help | Maximilian Hils | 2014-07-06 | 1 | -2/+2 |
| | |||||
* | Merge pull request #300 from zbrdge/freebsd-platform | Maximilian Hils | 2014-07-03 | 5 | -6/+25 |
|\ | | | | | Freebsd 10 platform | ||||
| * | added unit test update. coverage still at 97% | Zack B | 2014-07-01 | 2 | -5/+11 |
| | | |||||
| * | 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 | 5 | -19/+16 |
|\ \ | |/ |/| | Remove global should_exit and fix tests | ||||
| * | Remove global should_exit and fix tests | Vyacheslav Bakhmutov | 2014-06-13 | 5 | -19/+16 |
| | | |||||
* | | 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 | 5 | -79/+82 |
| | |||||
* | fix #253 | Maximilian Hils | 2014-05-15 | 3 | -7/+18 |
| | |||||
* | 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 |
| | |||||
* | Merge pull request #271 from davidpshaw/master | Maximilian Hils | 2014-05-07 | 9 | -0/+1236 |
|\ | | | | | - working WBXML parser | ||||
| * | - 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 |
| | | |||||
* | | Merge pull request #268 from shvar/patch-1 | Maximilian Hils | 2014-04-29 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix upstream_cert call in case of https2http | ||||
| * | 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 |
| | |||||
* | update firefox cert install docs | Maximilian Hils | 2014-04-10 | 1 | -2/+2 |
| | |||||
* | fix issue #260 | Maximilian Hils | 2014-04-07 | 1 | -1/+3 |
| | |||||
* | Merge pull request #252 from jeanregisser/master | Maximilian Hils | 2014-03-26 | 1 | -1/+0 |
|\ | | | | | Fixed palette forced to light in mitmproxywrapper.py | ||||
| * | Fixed palette forced to light in mitmproxywrapper.py | Jean Regisser | 2014-03-26 | 1 | -1/+0 |
|/ | |||||
* | beef up error messages | Maximilian Hils | 2014-03-26 | 1 | -1/+1 |
| | |||||
* | add requests to requrements, improve error logging | Maximilian Hils | 2014-03-19 | 2 | -1/+5 |
| | |||||
* | 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 |
| | |||||
* | Merge pull request #239 from mitmproxy/options_cleanup | Maximilian Hils | 2014-03-18 | 9 | -85/+85 |
|\ | | | | | Options cleanup | ||||
| * | forward proxy -> upstream proxy | Maximilian Hils | 2014-03-14 | 7 | -20/+20 |
| | | |||||
| * | remove debug switch | Maximilian Hils | 2014-03-13 | 2 | -7/+1 |
| | | |||||
| * | order command line options, add disting proxy option group | Maximilian Hils | 2014-03-13 | 2 | -64/+70 |
| | | |||||
* | | Merge pull request #238 from mitmproxy/log_levels | Maximilian Hils | 2014-03-18 | 16 | -99/+105 |
|\| | | | | | Log Levels | ||||
| * | adjust command line docs, fix log typo | Maximilian Hils | 2014-03-13 | 3 | -4/+4 |
| | | |||||
| * | fix linux tests... | Maximilian Hils | 2014-03-13 | 1 | -6/+6 |
| | | |||||
| * | adjust tests, fix option handling | Maximilian Hils | 2014-03-13 | 5 | -17/+11 |
| | | |||||
| * | 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 | 4 | -15/+24 |
| | | |||||
| * | restrict -e to mitmproxy only (not mitmdump) | Maximilian Hils | 2014-03-12 | 6 | -16/+14 |
| | | |||||
* | | fix #240 | Maximilian Hils | 2014-03-18 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-03-11 | 4 | -24/+45 |
|\ | |||||
| * | Certificate forwarding. | Aldo Cortesi | 2014-03-11 | 4 | -24/+45 |
| | | |||||
* | | fix temporary server change, coverage++ | Maximilian Hils | 2014-03-11 | 4 | -15/+70 |
|/ | |||||
* | 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 |
| |