[FFmpeg-cvslog] http: Don't use the normal http proxy mechanism for https

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Nov 10 14:57:15 2011 +0200| [dbc2424baa5aa4c72026d167f0678f2374620f44] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbc2424baa5aa4c72026d167f0678f2374620f44
---

 libavformat/http.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index 45253d4..63cfecd 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;
     }