[vlc-commits] httpd: advertise HTTP/1.1 support over TLS

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 23 23:15:02 2014 +0300| [1f4ef74700134b3947b23bf83ca5625f17708f58] | committer: Rémi Denis-Courmont

httpd: advertise HTTP/1.1 support over TLS

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

 src/network/httpd.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/network/httpd.c b/src/network/httpd.c
index e243ac6..e9a1820 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -2047,8 +2047,12 @@ static void httpdLoop(httpd_host_t *host)
 
         vlc_tls_t *p_tls;
 
-        if (host->p_tls)
-            p_tls = vlc_tls_SessionCreate(host->p_tls, fd, NULL, NULL);
+        if (host->p_tls != NULL)
+        {
+            const char *alpn[] = { "http/1.1", NULL };
+
+            p_tls = vlc_tls_SessionCreate(host->p_tls, fd, NULL, alpn);
+        }
         else
             p_tls = NULL;