summaryrefslogtreecommitdiff
path: root/libavformat/http.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-11-10 14:57:15 +0200
committerMartin Storsjö <martin@martin.st>2011-11-18 10:59:53 +0200
commitdbc2424baa5aa4c72026d167f0678f2374620f44 (patch)
treecba2665e898920fa1fdb749a5f7d882563e20df1 /libavformat/http.c
parent2565dbeb3e36e4f2d7970aa756c6ac40b7f46914 (diff)
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ö <martin@martin.st>
Diffstat (limited to 'libavformat/http.c')
-rw-r--r--libavformat/http.c1
1 files changed, 1 insertions, 0 deletions
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;
}