[vlc-commits] http: negotiate HTTP/1.1 explicitly over TLS

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 23 23:24:37 2014 +0300| [b3b724f1628319e78be769eb725529a1a00fd96b] | committer: Rémi Denis-Courmont

http: negotiate HTTP/1.1 explicitly over TLS

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

 modules/access/http.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/access/http.c b/modules/access/http.c
index 91ac069..9afca9f 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -1108,8 +1108,11 @@ static int Connect( access_t *p_access, uint64_t i_tell )
         }
 
         /* TLS/SSL handshake */
+        const char *alpn[] = { "http/1.1", NULL };
+
         p_sys->p_tls = vlc_tls_ClientSessionCreate( p_sys->p_creds, p_sys->fd,
-                                    p_sys->url.psz_host, "https", NULL, NULL );
+                p_sys->url.psz_host, "https",
+                p_sys->i_version ? alpn : NULL, NULL );
         if( p_sys->p_tls == NULL )
         {
             msg_Err( p_access, "cannot establish HTTP/TLS session" );