{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1713561900, "reponame":"libwebsockets", "desc":"libwebsockets lightweight C networking library", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://libwebsockets.org/repo/libwebsockets", "f":3, "items": [ {"schema":"libjg2-1", "cid":"c32a01e47b572d3aa1875b7d8922c841", "commit": {"type":"commit", "time": 1519691161, "time_ofs": 480, "oid_tree": { "oid": "d983cad81fb432d250ba07011c159df63577b194", "alias": []}, "oid":{ "oid": "3e3c270f76d3c6bc97f4bb484e61d8c8c8eeacac", "alias": []}, "msg": "LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT: fixes after tls refactor", "sig_commit": { "git_time": { "time": 1519691161, "offset": 480 }, "name": "Andy Green", "email": "agreen@learn.home.warmcat.com", "md5": "df202380f567ecf49d1c8e26a6335052" }, "sig_author": { "git_time": { "time": 1519691161, "offset": 480 }, "name": "Andy Green", "email": "agreen@learn.home.warmcat.com", "md5": "df202380f567ecf49d1c8e26a6335052" }}, "body": "LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT: fixes after tls refactor\n\nhttps://github.com/warmcat/libwebsockets/issues/1191" , "diff": "diff --git a/lib/http2/ssl-http2.c b/lib/http2/ssl-http2.c\nindex 592a73d..894fa71 100644\n--- a/lib/http2/ssl-http2.c\n+++ b/lib/http2/ssl-http2.c\n@@ -103,6 +103,9 @@ int lws_h2_configure_if_upgraded(struct lws *wsi)\n \tchar cstr[10];\n \tunsigned len;\n \n+\tif (!wsi-\u003essl)\n+\t\treturn 0;\n+\n \tSSL_get0_alpn_selected(wsi-\u003essl, \u0026name, \u0026len);\n \tif (!len) {\n \t\tlwsl_info(\u0022no ALPN upgrade\u005cn\u0022);\ndiff --git a/lib/server/ssl-server.c b/lib/server/ssl-server.c\nindex a9516f2..c436282 100644\n--- a/lib/server/ssl-server.c\n+++ b/lib/server/ssl-server.c\n@@ -155,7 +155,7 @@ lws_ssl_server_name_cb(SSL *ssl, int *ad, void *arg)\n \t */\n \tvh \u003d context-\u003evhost_list;\n \twhile (vh) {\n-\t\tif (!vh-\u003ebeing_destroyed \u0026\u0026 vh-\u003essl_ctx \u003d\u003d SSL_get_SSL_CTX(ssl))\n+\t\tif (!vh-\u003ebeing_destroyed \u0026\u0026 ssl \u0026\u0026 vh-\u003essl_ctx \u003d\u003d SSL_get_SSL_CTX(ssl))\n \t\t\tbreak;\n \t\tvh \u003d vh-\u003evhost_next;\n \t}\ndiff --git a/lib/ssl.c b/lib/ssl.c\nindex 007dd3e..755d06d 100644\n--- a/lib/ssl.c\n+++ b/lib/ssl.c\n@@ -904,7 +904,7 @@ accepted:\n \t\t/* adapt our vhost to match the SNI SSL_CTX that was chosen */\n \t\tvh \u003d context-\u003evhost_list;\n \t\twhile (vh) {\n-\t\t\tif (!vh-\u003ebeing_destroyed \u0026\u0026\n+\t\t\tif (!vh-\u003ebeing_destroyed \u0026\u0026 wsi-\u003essl \u0026\u0026\n \t\t\t vh-\u003essl_ctx \u003d\u003d SSL_get_SSL_CTX(wsi-\u003essl)) {\n \t\t\t\tlwsl_info(\u0022setting wsi to vh %s\u005cn\u0022, vh-\u003ename);\n \t\t\t\twsi-\u003evhost \u003d vh;\n","s":{"c":1713561900,"u": 6428}} ],"g": 6925,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}