summaryrefslogtreecommitdiff
path: root/doc/protocols.texi
diff options
context:
space:
mode:
authorMoritz Barsnick <barsnick@gmx.net>2020-08-23 13:53:39 +0200
committerMarton Balint <cus@passwd.hu>2021-03-19 22:43:02 +0100
commit94b63e8ae8deb218339d93a3ec0732826dba7a54 (patch)
tree0889f8502a10eede24ba633a5f9025b8a56c1ea2 /doc/protocols.texi
parent4892060f50cc91ae6b1b5a3c28346fb9a829c757 (diff)
avformat/http,tls: honor http_proxy command line variable for HTTPS
Add the "http_proxy" option and its handling to the "tls" protocol, pass the option from the "https" protocol. The "https" protocol already defines the "http_proxy" command line option, like the "http" protocol does. The "http" protocol properly honors that command line option in addition to the environment variable. The "https" protocol doesn't, because the proxy is evaluated in the underlying "tls" protocol, which doesn't have this option, and thus only handles the environment variable, which it has access to. Fixes #7223. Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'doc/protocols.texi')
-rw-r--r--doc/protocols.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 3644fe3dd6..78afe6ec8e 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -1772,6 +1772,10 @@ A file containing the private key for the certificate.
If enabled, listen for connections on the provided port, and assume
the server role in the handshake instead of the client role.
+@item http_proxy
+The HTTP proxy to tunnel through, e.g. @code{http://example.com:1234}.
+The proxy must support the CONNECT method.
+
@end table
Example command lines: