diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-10-23 16:17:03 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-10-23 16:17:03 +0200 |
| commit | 77c9f64526fb49f8787d85c879d7ff6bc91d7f56 (patch) | |
| tree | a5ee61de0e2a45c7c94ab90edba6efd39bffec71 /doc-src/features/upstreamproxy.html | |
| parent | 4bf07d8aa5b137cf39282502cc960b88ba40a790 (diff) | |
| parent | 6bed0764609029e9d01b1d28b7826fb37ab20d3e (diff) | |
| download | mitmproxy-77c9f64526fb49f8787d85c879d7ff6bc91d7f56.tar.gz mitmproxy-77c9f64526fb49f8787d85c879d7ff6bc91d7f56.tar.bz2 mitmproxy-77c9f64526fb49f8787d85c879d7ff6bc91d7f56.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Conflicts:
doc-src/modes.html
Diffstat (limited to 'doc-src/features/upstreamproxy.html')
| -rw-r--r-- | doc-src/features/upstreamproxy.html | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/doc-src/features/upstreamproxy.html b/doc-src/features/upstreamproxy.html index 6039f4df..47bc115d 100644 --- a/doc-src/features/upstreamproxy.html +++ b/doc-src/features/upstreamproxy.html @@ -9,8 +9,19 @@ mitmproxy forwards ordinary HTTP requests to an upstream server. <tr> <th width="20%">command-line</th> <td>-U http://hostname[:port]</td> </tr> - <tr> - <th>mitmproxy shortcut</th> <td><b>U</b></td> - </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 + + |