diff options
| author | Rouli <rouli.net@gmail.com> | 2013-03-18 14:24:13 +0200 |
|---|---|---|
| committer | Rouli <rouli.net@gmail.com> | 2013-03-18 14:24:13 +0200 |
| commit | c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f (patch) | |
| tree | 1e62785d669d86f6e551a99b9debfe445389bd48 /doc-src/features | |
| parent | b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924 (diff) | |
| parent | 5c33f6784b4ba34dd9825ea7e3070cdf0b2b4621 (diff) | |
| download | mitmproxy-c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f.tar.gz mitmproxy-c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f.tar.bz2 mitmproxy-c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc-src/features')
| -rw-r--r-- | doc-src/features/proxyauth.html | 5 | ||||
| -rw-r--r-- | doc-src/features/sticky.html | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/doc-src/features/proxyauth.html b/doc-src/features/proxyauth.html index 0618ee68..c22d50f3 100644 --- a/doc-src/features/proxyauth.html +++ b/doc-src/features/proxyauth.html @@ -1,8 +1,9 @@ - Asks the user for authentication before they are permitted to use the proxy. Authentication headers are stripped from the flows, so they are not passed to -upstream servers. For now, only HTTP Basic authentication is supported. +upstream servers. For now, only HTTP Basic authentication is supported. The +proxy auth options are ignored if the proxy is in transparent or reverse proxy +mode. <table class="table"> <tbody> diff --git a/doc-src/features/sticky.html b/doc-src/features/sticky.html index 1b79f922..59116067 100644 --- a/doc-src/features/sticky.html +++ b/doc-src/features/sticky.html @@ -22,8 +22,7 @@ with the secured resources. <th width="20%">command-line</th> <td> <ul> - <li>-t (sticky cookies on all requests)</li> - <li>-T FILTER (sticky cookies on requests matching filter</li> + <li>-t FILTER</li> </ul> </td> </tr> @@ -48,8 +47,7 @@ replay of HTTP Digest authentication. <th width="20%">command-line</th> <td> <ul> - <li>-u (sticky auth on all requests)</li> - <li>-U FILTER (sticky auth on requests matching filter</li> + <li>-u FILTER</li> </ul> </td> </tr> |