From 5106e9141ff94b33e23e47fdab834e4cd1606a24 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Tue, 18 Jul 2017 11:15:43 +0800 Subject: [PATCH] explicit vhosts: only check context for flag Although the test apps reuse the context info directly and so inherit the flag state there when creating vhosts, users might generate a fresh info without the flag for vhost creation. So just go by what was given at context creation time. --- lib/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/context.c b/lib/context.c index f3b56ce..9b89564 100644 --- a/lib/context.c +++ b/lib/context.c @@ -490,7 +490,7 @@ lws_create_vhost(struct lws_context *context, * for a protocol get it enabled. */ - if (info->options & LWS_SERVER_OPTION_EXPLICIT_VHOSTS) + if (context->options & LWS_SERVER_OPTION_EXPLICIT_VHOSTS) f = 0; (void)f; #ifdef LWS_WITH_PLUGINS @@ -520,7 +520,7 @@ lws_create_vhost(struct lws_context *context, #ifdef LWS_WITH_PLUGINS (context->plugin_list) || #endif - info->options & LWS_SERVER_OPTION_EXPLICIT_VHOSTS) + context->options & LWS_SERVER_OPTION_EXPLICIT_VHOSTS) vh->protocols = lwsp; else { vh->protocols = info->protocols; -- 2.7.4