From 87305c82d30693d0b53a8bfbb5f73f13570243a0 Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Fri, 22 Mar 2019 05:29:40 +0800
Subject: [PATCH] alpn: handle ALLOW_NON_SSL_ON_SSL_PORT

---
 lib/tls/tls-server.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/tls/tls-server.c b/lib/tls/tls-server.c
index 9d3f70db..85bfab89 100644
--- a/lib/tls/tls-server.c
+++ b/lib/tls/tls-server.c
@@ -74,6 +74,9 @@ lws_tls_server_conn_alpn(struct lws *wsi)
 	char cstr[10];
 	unsigned len;
 
+	if (!wsi->tls.ssl)
+		return 0;
+
 	SSL_get0_alpn_selected(wsi->tls.ssl, &name, &len);
 	if (!len) {
 		lwsl_info("no ALPN upgrade\n");
-- 
GitLab