[vlc-commits] securetransport: ignore ALPN parameter as the backend cannot handle it ( closes #17222)

Felix Paul Kühne git at videolan.org
Sun Feb 5 14:58:38 CET 2017


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Feb  5 14:55:10 2017 +0100| [0a629a879aa51725a6733ad6dd78301d01862ec2] | committer: Felix Paul Kühne

securetransport: ignore ALPN parameter as the backend cannot handle it (closes #17222)

This may lead to undefined proxy behavior and must be reverted as soon as ALPN support in SecureTransport is published.

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

 modules/misc/securetransport.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/misc/securetransport.c b/modules/misc/securetransport.c
index 0802dee..cf05297 100644
--- a/modules/misc/securetransport.c
+++ b/modules/misc/securetransport.c
@@ -617,10 +617,12 @@ static int st_SessionOpenCommon (vlc_tls_creds_t *crd, vlc_tls_t *tls,
 
 static int st_ClientSessionOpen (vlc_tls_creds_t *crd, vlc_tls_t *tls,
                                  vlc_tls_t *sock, const char *hostname,
-                                 const char *const *alpn) {
-
-    if (alpn != NULL)
-        return VLC_EGENERIC;
+                                 const char *const *alpn)
+{
+    if (alpn != NULL) {
+        msg_Warn(crd, "Ignoring ALPN request due to lack of support in the backend. Proxy behavior potentially undefined.");
+#warning ALPN support missing, proxy behavior potentially undefined (rdar://30366695, #17722)
+    }
 
     msg_Dbg(crd, "open TLS session for %s", hostname);
 



More information about the vlc-commits mailing list