diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-01-02 13:42:56 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-01-02 13:42:56 +1300 |
| commit | b14b4ace25b456f54677fe8efc910d8db0f36506 (patch) | |
| tree | a34f30d8de4ae6d213e6c2da55dea2dcea4525e8 /doc-src | |
| parent | bb5fb2dbe0c02de9702057f50d41b529dbae0099 (diff) | |
| parent | c152e5da1a1a559a29d77dabd121f06ed7c7bc3e (diff) | |
| download | mitmproxy-b14b4ace25b456f54677fe8efc910d8db0f36506.tar.gz mitmproxy-b14b4ace25b456f54677fe8efc910d8db0f36506.tar.bz2 mitmproxy-b14b4ace25b456f54677fe8efc910d8db0f36506.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
Diffstat (limited to 'doc-src')
| -rw-r--r-- | doc-src/features/upstreamproxy.html | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/doc-src/features/upstreamproxy.html b/doc-src/features/upstreamproxy.html index 47bc115d..bb354cd3 100644 --- a/doc-src/features/upstreamproxy.html +++ b/doc-src/features/upstreamproxy.html @@ -11,17 +11,3 @@ mitmproxy forwards ordinary HTTP requests to an upstream server. </tr> </tbody> </table> - -Here, **schema** is one of http, https, http2https or https2http. The latter -two extended schema specifications control the use of HTTP and HTTPS on -mitmproxy and the upstream server. You can indicate that mitmproxy should use -HTTP, and the upstream server uses HTTPS like this: - - http2https://hostname:port - -And you can indicate that mitmproxy should use HTTPS while the upstream -service uses HTTP like this: - - https2http://hostname:port - - |