Skip to content

Commit

Permalink
Keep sidebar ordering alphabetical, add SOCKS documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
cortesi committed Oct 23, 2014
1 parent 6fcd1d0 commit 5aace7e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
9 changes: 5 additions & 4 deletions doc-src/_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions doc-src/features/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
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"),
Expand Down
10 changes: 10 additions & 0 deletions doc-src/features/socksproxy.html
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 5aace7e

Please sign in to comment.