stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT: fixes after tls refactor

Browse source 
https://github.com/warmcat/libwebsockets/issues/1191
This commit is contained in:
Andy Green 2018-02-27 07:48:25 +08:00
parent e02a999863
commit 7bc6383759
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/http2/ssl-http2.c
View file

@ -103,6 +103,9 @@ int lws_h2_configure_if_upgraded(struct lws *wsi)
char cstr[10];
unsigned len;
if (!wsi->ssl)
return 0;
SSL_get0_alpn_selected(wsi->ssl, &name, &len);
if (!len) {
lwsl_info("no ALPN upgrade\n");

7
lib/server/ssl-server.c
View file

@ -207,6 +207,11 @@ lws_server_socket_service_ssl(struct lws *wsi, lws_sockfd_type accept_fd)
wsi->use_ssl = 0;
lws_tls_server_abort_connection(wsi);
/*
* care... this creates wsi with no ssl
* when ssl is enabled and normally
* mandatory
*/
wsi->ssl = NULL;
if (lws_check_opt(context->options,
LWS_SERVER_OPTION_REDIRECT_HTTP_TO_HTTPS))
@ -280,7 +285,7 @@ accepted:
/* adapt our vhost to match the SNI SSL_CTX that was chosen */
vh = context->vhost_list;
while (vh) {
if (!vh->being_destroyed &&
if (!vh->being_destroyed && wsi->ssl &&
vh->ssl_ctx == lws_tls_ctx_from_wsi(wsi)) {
lwsl_info("setting wsi to vh %s\n", vh->name);
wsi->vhost = vh;

3
lib/tls/mbedtls/ssl.c
View file

@ -295,6 +295,9 @@ lws_ssl_context_destroy(struct lws_context *context)
lws_tls_ctx *
lws_tls_ctx_from_wsi(struct lws *wsi)
{
if (!wsi->ssl)
return NULL;
return SSL_get_SSL_CTX(wsi->ssl);
}

3
lib/tls/openssl/ssl.c
View file

@ -456,6 +456,9 @@ lws_ssl_context_destroy(struct lws_context *context)
lws_tls_ctx *
lws_tls_ctx_from_wsi(struct lws *wsi)
{
if (!wsi->ssl)
return NULL;
return SSL_get_SSL_CTX(wsi->ssl);
}