diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-14 00:02:00 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-14 00:02:00 +0100 |
| commit | a66913d4a30b2ce2dedc58afcf79ad77faead278 (patch) | |
| tree | 55b58e1ce75e67fcfe3a8262f648b9b96e761b83 /doc-src | |
| parent | f14eeef6539ac4f104dc37b37fbc74b9ea861965 (diff) | |
| download | mitmproxy-a66913d4a30b2ce2dedc58afcf79ad77faead278.tar.gz mitmproxy-a66913d4a30b2ce2dedc58afcf79ad77faead278.tar.bz2 mitmproxy-a66913d4a30b2ce2dedc58afcf79ad77faead278.zip | |
forward proxy -> upstream proxy
Diffstat (limited to 'doc-src')
| -rw-r--r-- | doc-src/_nav.html | 2 | ||||
| -rw-r--r-- | doc-src/features/index.py | 2 | ||||
| -rw-r--r-- | doc-src/features/reverseproxy.html | 6 | ||||
| -rw-r--r-- | doc-src/features/upstreamproxy.html (renamed from doc-src/features/forwardproxy.html) | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/doc-src/_nav.html b/doc-src/_nav.html index 5460601f..ddc27dca 100644 --- a/doc-src/_nav.html +++ b/doc-src/_nav.html @@ -11,7 +11,7 @@ $!nav("anticache.html", this, state)!$ $!nav("clientreplay.html", this, state)!$ $!nav("filters.html", this, state)!$ - $!nav("forwardproxy.html", this, state)!$ + $!nav("upstreamproxy.html", this, state)!$ $!nav("proxyauth.html", this, state)!$ $!nav("replacements.html", this, state)!$ $!nav("serverreplay.html", this, state)!$ diff --git a/doc-src/features/index.py b/doc-src/features/index.py index e15f3311..0618681f 100644 --- a/doc-src/features/index.py +++ b/doc-src/features/index.py @@ -4,7 +4,7 @@ pages = [ Page("anticache.html", "Anticache"), Page("clientreplay.html", "Client-side replay"), Page("filters.html", "Filter expressions"), - Page("forwardproxy.html", "Forward proxy mode"), + Page("upstreamproxy.html", "Upstream proxy mode"), Page("setheaders.html", "Set Headers"), Page("serverreplay.html", "Server-side replay"), Page("sticky.html", "Sticky cookies and auth"), diff --git a/doc-src/features/reverseproxy.html b/doc-src/features/reverseproxy.html index 7be02b87..7ad1c26c 100644 --- a/doc-src/features/reverseproxy.html +++ b/doc-src/features/reverseproxy.html @@ -1,8 +1,8 @@ In reverse proxy mode, mitmproxy accepts standard HTTP requests and forwards -them to the specified upstream server. This is in contrast to <a -href="@!urlTo("forwardproxy.html")!@">forward proxy mode</a>, in which -mitmproxy forwards HTTP proxy requests to an upstream server. +them to the specified upstream server. This is in contrast to +<a href="@!urlTo("upstreamproxy.html")!@">upstream proxy mode</a>, in which +mitmproxy forwards HTTP proxy requests to an upstream proxy server. Note that the displayed URL for flows in this mode will use the value of the __Host__ header field from the request, not the reverse proxy server. diff --git a/doc-src/features/forwardproxy.html b/doc-src/features/upstreamproxy.html index 203520d5..5b9c2289 100644 --- a/doc-src/features/forwardproxy.html +++ b/doc-src/features/upstreamproxy.html @@ -1,16 +1,16 @@ In this mode, mitmproxy accepts proxy requests and unconditionally forwards all -requests to a specified upstream server. This is in contrast to <a +requests to a specified upstream proxy server. This is in contrast to <a href="@!urlTo("reverseproxy.html")!@">reverse proxy mode</a>, in which mitmproxy forwards ordinary HTTP requests to an upstream server. <table class="table"> <tbody> <tr> - <th width="20%">command-line</th> <td>-F http[s]://hostname[:port]</td> + <th width="20%">command-line</th> <td>-U http[s]://hostname[:port]</td> </tr> <tr> - <th>mitmproxy shortcut</th> <td><b>F</b></td> + <th>mitmproxy shortcut</th> <td><b>U</b></td> </tr> </tbody> </table> |