From: Martin Storsjö Date: Thu, 10 Nov 2011 12:57:15 +0000 (+0200) Subject: http: Don't use the normal http proxy mechanism for https X-Git-Tag: n0.9~57^2~59 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=dbc2424baa5aa4c72026d167f0678f2374620f44 http: Don't use the normal http proxy mechanism for https The tls protocol handles connections via proxies internally. With TLS/SSL, the peer verification requires that the client speaks directly with the server, since the proxy doesn't have the remote server's private key. Signed-off-by: Martin Storsjö --- diff --git a/libavformat/http.c b/libavformat/http.c index 45253d4efd..63cfecd332 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -112,6 +112,7 @@ static int http_open_cnx(URLContext *h) if (!strcmp(proto, "https")) { lower_proto = "tls"; + use_proxy = 0; if (port < 0) port = 443; }