From 031cdeb129cfaa7444ace24c0ea47ac06677f0d8 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Tue, 20 Feb 2018 13:33:27 +0100 Subject: [PATCH] utils: fix #16138 by checking if vhosts flag is set --- cmd/utils/flags.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 5fd5013f00..72be2dbeb7 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -695,8 +695,11 @@ func setHTTP(ctx *cli.Context, cfg *node.Config) { if ctx.GlobalIsSet(RPCApiFlag.Name) { cfg.HTTPModules = splitAndTrim(ctx.GlobalString(RPCApiFlag.Name)) } - - cfg.HTTPVirtualHosts = splitAndTrim(ctx.GlobalString(RPCVirtualHostsFlag.Name)) + if ctx.GlobalIsSet(RPCVirtualHostsFlag.Name) { + cfg.HTTPVirtualHosts = splitAndTrim(ctx.GlobalString(RPCVirtualHostsFlag.Name)) + } else if len(cfg.HTTPVirtualHosts) == 0 { + cfg.HTTPVirtualHosts = splitAndTrim(ctx.GlobalString(RPCVirtualHostsFlag.Name)) + } } // setWS creates the WebSocket RPC listener interface string from the set