]> git.sesse.net Git - ffmpeg/commit
avformat/http,tls: honor http_proxy command line variable for HTTPS
authorMoritz Barsnick <barsnick@gmx.net>
Sun, 23 Aug 2020 11:53:39 +0000 (13:53 +0200)
committerMarton Balint <cus@passwd.hu>
Fri, 19 Mar 2021 21:43:02 +0000 (22:43 +0100)
commit94b63e8ae8deb218339d93a3ec0732826dba7a54
tree0889f8502a10eede24ba633a5f9025b8a56c1ea2
parent4892060f50cc91ae6b1b5a3c28346fb9a829c757
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>
doc/protocols.texi
libavformat/http.c
libavformat/tls.c
libavformat/tls.h