From 204b8955764e5094c7df5585bf46f67f5497b445 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Sat, 16 Feb 2019 21:25:19 +0100 Subject: [PATCH] fix user level parsing in freedom. fixes #1555 --- infra/conf/freedom.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/conf/freedom.go b/infra/conf/freedom.go index 44c36646d..f1f8b2ba1 100644 --- a/infra/conf/freedom.go +++ b/infra/conf/freedom.go @@ -29,7 +29,7 @@ func (c *FreedomConfig) Build() (proto.Message, error) { case "useip6", "useipv6", "use_ipv6", "use_ip_v6", "use_ip6": config.DomainStrategy = freedom.Config_USE_IP6 } - config.Timeout = 600 + if c.Timeout != nil { config.Timeout = *c.Timeout }