diff options
| author | Aldo Cortesi <aldo@corte.si> | 2017-12-15 09:49:24 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 09:49:24 +1300 |
| commit | dfcf62ff2b5a6c53ad027ea721431450169ab3ea (patch) | |
| tree | 7c7c26809906f29ba95fed0c4436c9e20e868673 /docs/features | |
| parent | d9848a8bc1b6a3ea7741c657133f09e969052e02 (diff) | |
| parent | f5fafbfcb56bbc3fb7cca7ed32dd7b3b41c39e83 (diff) | |
| download | mitmproxy-dfcf62ff2b5a6c53ad027ea721431450169ab3ea.tar.gz mitmproxy-dfcf62ff2b5a6c53ad027ea721431450169ab3ea.tar.bz2 mitmproxy-dfcf62ff2b5a6c53ad027ea721431450169ab3ea.zip | |
Merge pull request #2545 from mitmproxy/wsproto
Replace our WebSocket stack with wsproto
Diffstat (limited to 'docs/features')
| -rw-r--r-- | docs/features/passthrough.rst | 4 | ||||
| -rw-r--r-- | docs/features/tcpproxy.rst | 31 |
2 files changed, 2 insertions, 33 deletions
diff --git a/docs/features/passthrough.rst b/docs/features/passthrough.rst index 00462e9d..dbaf3506 100644 --- a/docs/features/passthrough.rst +++ b/docs/features/passthrough.rst @@ -13,7 +13,7 @@ mechanism: away. Note that mitmproxy's "Limit" option is often the better alternative here, as it is not affected by the limitations listed below. -If you want to peek into (SSL-protected) non-HTTP connections, check out the :ref:`tcpproxy` +If you want to peek into (SSL-protected) non-HTTP connections, check out the :ref:`tcp_proxy` feature. If you want to ignore traffic from mitmproxy's processing because of large response bodies, take a look at the :ref:`streaming` feature. @@ -88,7 +88,7 @@ Here are some other examples for ignore patterns: .. seealso:: - - :ref:`tcpproxy` + - :ref:`tcp_proxy` - :ref:`streaming` - mitmproxy's "Limit" feature diff --git a/docs/features/tcpproxy.rst b/docs/features/tcpproxy.rst deleted file mode 100644 index cba374e3..00000000 --- a/docs/features/tcpproxy.rst +++ /dev/null @@ -1,31 +0,0 @@ -.. _tcpproxy: - -TCP Proxy -========= - -In case mitmproxy does not handle a specific protocol, you can exempt -hostnames from processing, so that mitmproxy acts as a generic TCP forwarder. -This feature is closely related to the :ref:`passthrough` functionality, -but differs in two important aspects: - -- The raw TCP messages are printed to the event log. -- SSL connections will be intercepted. - -Please note that message interception or modification are not possible yet. -If you are not interested in the raw TCP messages, you should use the ignore domains feature. - -How it works ------------- - -================== ====================== -command-line ``--tcp HOST`` -mitmproxy shortcut :kbd:`O` then :kbd:`T` -================== ====================== - -For a detailed description how the hostname pattern works, please look at the :ref:`passthrough` -feature. - -.. seealso:: - - - :ref:`passthrough` - - :ref:`streaming` |