diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-10-23 15:05:01 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-10-23 15:05:01 +1300 |
| commit | 5aace7eed8899756799679f7667739dfb58b4dbc (patch) | |
| tree | 03cd839c0a0e7929d4e66b7a7950d5fde1dffd30 | |
| parent | 6fcd1d0ed9b714ccd93ebb3abb0ffe0d5c3d8ff0 (diff) | |
| download | mitmproxy-5aace7eed8899756799679f7667739dfb58b4dbc.tar.gz mitmproxy-5aace7eed8899756799679f7667739dfb58b4dbc.tar.bz2 mitmproxy-5aace7eed8899756799679f7667739dfb58b4dbc.zip | |
Keep sidebar ordering alphabetical, add SOCKS documentation
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | doc-src/_nav.html | 9 | ||||
| -rw-r--r-- | doc-src/features/index.py | 1 | ||||
| -rw-r--r-- | doc-src/features/socksproxy.html | 10 |
4 files changed, 17 insertions, 5 deletions
@@ -1,7 +1,7 @@ 23 October 2014: mitmproxy 0.11: - * SOCKS proxy mode + * SOCKS5 proxy mode allows mitmproxy to act as a SOCKS5 proxy server * Data streaming for response bodies exceeding a threshold (bradpeabody@gmail.com) diff --git a/doc-src/_nav.html b/doc-src/_nav.html index 8bd03db2..0ae0fa67 100644 --- a/doc-src/_nav.html +++ b/doc-src/_nav.html @@ -17,13 +17,14 @@ $!nav("serverreplay.html", this, state)!$ $!nav("setheaders.html", this, state)!$ $!nav("passthrough.html", this, state)!$ - $!nav("tcpproxy.html", this, state)!$ - $!nav("sticky.html", this, state)!$ + $!nav("proxyauth.html", this, state)!$ $!nav("reverseproxy.html", this, state)!$ + $!nav("responsestreaming.html", this, state)!$ + $!nav("socksproxy.html", this, state)!$ + $!nav("sticky.html", this, state)!$ + $!nav("tcpproxy.html", this, state)!$ $!nav("upstreamproxy.html", this, state)!$ $!nav("upstreamcerts.html", this, state)!$ - $!nav("proxyauth.html", this, state)!$ - $!nav("responsestreaming.html", this, state)!$ <li class="nav-header">Installing Certificates</li> diff --git a/doc-src/features/index.py b/doc-src/features/index.py index 40a2669c..693b4439 100644 --- a/doc-src/features/index.py +++ b/doc-src/features/index.py @@ -9,6 +9,7 @@ pages = [ Page("replacements.html", "Replacements"), Page("responsestreaming.html", "Response Streaming"), Page("reverseproxy.html", "Reverse proxy mode"), + Page("socksproxy.html", "SOCKS 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/socksproxy.html b/doc-src/features/socksproxy.html new file mode 100644 index 00000000..f436cbf5 --- /dev/null +++ b/doc-src/features/socksproxy.html @@ -0,0 +1,10 @@ + +In this mode, mitmproxy acts as a SOCKS5 proxy server. + +<table class="table"> + <tbody> + <tr> + <th width="20%">command-line</th> <td>--socks</td> + </tr> + </tbody> +</table> |