| Commit message (Expand) | Author | Age | Files | Lines |
* | remove proxy mode abstraction: always be clear which mode we are in | Maximilian Hils | 2014-09-08 | 3 | -34/+68 |
* | add --ignore ui indication | Maximilian Hils | 2014-09-08 | 1 | -1/+5 |
* | Merge pull request #347 from mitmproxy/issue_341 | Aldo Cortesi | 2014-09-07 | 5 | -45/+20 |
|\ |
|
| * | update docs, mostly revert 2f44b26b4cd014e03dd62a125d79af9b81663a93 | Maximilian Hils | 2014-09-05 | 3 | -5/+5 |
| * | coverage++ | Maximilian Hils | 2014-09-04 | 1 | -9/+4 |
| * | simplify server changes for inline scripts | Maximilian Hils | 2014-09-03 | 3 | -31/+11 |
* | | coverage++ | Maximilian Hils | 2014-09-06 | 1 | -6/+6 |
|/ |
|
* | improve error handling | Maximilian Hils | 2014-09-02 | 2 | -15/+17 |
* | minor fixes | Maximilian Hils | 2014-08-31 | 2 | -2/+1 |
* | refactor protocol handling, fix #332 | Maximilian Hils | 2014-08-30 | 3 | -37/+29 |
* | fix script tests | Maximilian Hils | 2014-08-18 | 1 | -0/+2 |
* | fix #327 | Maximilian Hils | 2014-08-18 | 1 | -0/+20 |
* | do not connect if inline script already connected to upstream server | Maximilian Hils | 2014-08-12 | 1 | -1/+1 |
* | fix #270 | Maximilian Hils | 2014-08-10 | 1 | -3/+4 |
* | implement passthrough mode, fixes #175 | Maximilian Hils | 2014-08-09 | 2 | -18/+26 |
* | fix #308 | Maximilian Hils | 2014-08-08 | 1 | -1/+1 |
* | fix display of urls in upstream mode, refs #308 | Maximilian Hils | 2014-08-08 | 1 | -1/+1 |
* | fix #318 | Maximilian Hils | 2014-08-08 | 1 | -33/+47 |
* | remove platform.setup | Maximilian Hils | 2014-08-08 | 1 | -2/+0 |
* | properly express state information on server connections, refs #315 | Maximilian Hils | 2014-08-08 | 2 | -3/+11 |
* | fix #317 | Maximilian Hils | 2014-08-03 | 1 | -2/+2 |
* | Merge branch 'stream' | Maximilian Hils | 2014-07-31 | 1 | -2/+2 |
|\ |
|
| * | always initialize HTTPResponse.stream attribute | Maximilian Hils | 2014-07-23 | 1 | -2/+2 |
* | | fix #259 | Maximilian Hils | 2014-07-26 | 1 | -3/+9 |
* | | if no_upstream_cert is set, include SNI value als SubjectAltName, fix #291 | Maximilian Hils | 2014-07-18 | 1 | -0/+2 |
* | | add transparent proxy mode on windows (docs still missing) | Maximilian Hils | 2014-07-16 | 1 | -0/+2 |
|/ |
|
* | fix ProxyError inheritance | Maximilian Hils | 2014-06-25 | 1 | -6/+4 |
* | expose sockname | Maximilian Hils | 2014-06-25 | 1 | -0/+3 |
* | add support for certificate chains, refs #174 | Maximilian Hils | 2014-05-21 | 2 | -3/+6 |
* | fix up error messages | Maximilian Hils | 2014-05-15 | 1 | -21/+19 |
* | re-use cert creation from netlib in handle_sni, fix #272 | Maximilian Hils | 2014-05-15 | 1 | -13/+22 |
* | Merge pull request #269 from shvar/master | Maximilian Hils | 2014-04-29 | 1 | -1/+3 |
|\ |
|
| * | 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 |
|/ |
|
* | forward proxy -> upstream proxy | Maximilian Hils | 2014-03-14 | 2 | -6/+6 |
* | order command line options, add disting proxy option group | Maximilian Hils | 2014-03-13 | 1 | -0/+5 |
* | adjust tests, fix option handling | Maximilian Hils | 2014-03-13 | 1 | -1/+1 |
* | add support for log levels | Maximilian Hils | 2014-03-13 | 2 | -17/+21 |
* | 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 | 2 | -5/+7 |
|/ |
|
* | always use relative imports, fix status bar bug | Maximilian Hils | 2014-03-10 | 4 | -1/+7 |
* | split up protocol\__init__.py | Maximilian Hils | 2014-03-10 | 2 | -3/+5 |
* | update docs, fix #215 | Maximilian Hils | 2014-03-10 | 1 | -9/+11 |
* | add advanced proxying options, add SSL-terminating capability to mitmproxy | Maximilian Hils | 2014-03-10 | 3 | -69/+72 |
* | lay the foundations for --(in|out)(abs|rel) command line switches, as propose... | Maximilian Hils | 2014-03-10 | 3 | -23/+13 |
* | finish proxy.py split up | Maximilian Hils | 2014-03-09 | 5 | -0/+590 |