diff options
| author | Moritz Barsnick <barsnick@gmx.net> | 2020-08-23 13:53:39 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2021-03-19 22:43:02 +0100 |
| commit | 94b63e8ae8deb218339d93a3ec0732826dba7a54 (patch) | |
| tree | 0889f8502a10eede24ba633a5f9025b8a56c1ea2 /libavformat/tls.c | |
| parent | 4892060f50cc91ae6b1b5a3c28346fb9a829c757 (diff) | |
| download | ffmpeg-94b63e8ae8deb218339d93a3ec0732826dba7a54.tar.gz | |
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 'libavformat/tls.c')
| -rw-r--r-- | libavformat/tls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/tls.c b/libavformat/tls.c index 10e0792e29..302c0f8d59 100644 --- a/libavformat/tls.c +++ b/libavformat/tls.c @@ -89,7 +89,7 @@ int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AV if (!c->host && !(c->host = av_strdup(c->underlying_host))) return AVERROR(ENOMEM); - proxy_path = getenv("http_proxy"); + proxy_path = c->http_proxy ? c->http_proxy : getenv("http_proxy"); use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), c->underlying_host) && proxy_path && av_strstart(proxy_path, "http://", NULL); |