Merge pull request #197 from sarbash/fix-tls-consul-registry

Check for uninitialized *config.HttpClient
micro · Aug 15, 2017 · e3f818d · e3f818d
2 parents 87c3954 + db0df07
commit e3f818d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/registry/consul_registry.go b/registry/consul_registry.go
@@ -59,6 +59,9 @@ func newConsulRegistry(opts ...Option) Registry {
 			config = c
 		}
 	}
+	if config.HttpClient == nil {
+		config.HttpClient = new(http.Client)
+	}
 
 	// set timeout
 	if options.Timeout > 0 {
@@ -81,9 +84,6 @@ func newConsulRegistry(opts ...Option) Registry {
 	if options.Secure || options.TLSConfig != nil {
 		config.Scheme = "https"
 		// We're going to support InsecureSkipVerify
-		if config.HttpClient == nil {
-			config.HttpClient = new(http.Client)
-		}
 		config.HttpClient.Transport = newTransport(options.TLSConfig)
 	}