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

explicit vhosts: only check context for flag

Browse source 
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.
This commit is contained in:
Andy Green 2017-07-18 11:15:43 +08:00
parent 61cc61817e
commit 5106e9141f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/context.c
View file

@ -490,7 +490,7 @@ lws_create_vhost(struct lws_context *context,
* for a protocol get it enabled. * for a protocol get it enabled.
*/ */
if (info->options & LWS_SERVER_OPTION_EXPLICIT_VHOSTS) if (context->options & LWS_SERVER_OPTION_EXPLICIT_VHOSTS)
f = 0; f = 0;
(void)f; (void)f;
#ifdef LWS_WITH_PLUGINS #ifdef LWS_WITH_PLUGINS
@ -520,7 +520,7 @@ lws_create_vhost(struct lws_context *context,
#ifdef LWS_WITH_PLUGINS #ifdef LWS_WITH_PLUGINS
(context->plugin_list) || (context->plugin_list) ||
#endif #endif
info->options & LWS_SERVER_OPTION_EXPLICIT_VHOSTS) context->options & LWS_SERVER_OPTION_EXPLICIT_VHOSTS)
vh->protocols = lwsp; vh->protocols = lwsp;
else { else {
vh->protocols = info->protocols; vh->protocols = info->protocols;