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

Asim Aslam · web-flow · commit e3f818d18e71 · 2017-08-15T08:51:50.000+01:00
Check for uninitialized *config.HttpClient
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)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ func newConsulRegistry(opts ...Option) Registry {`
`59`	`59`	`config = c`
`60`	`60`	`}`
`61`	`61`	`}`
	`62`	`+ if config.HttpClient == nil {`
	`63`	`+ config.HttpClient = new(http.Client)`
	`64`	`+ }`
`62`	`65`
`63`	`66`	`// set timeout`
`64`	`67`	`if options.Timeout > 0 {`
`@@ -81,9 +84,6 @@ func newConsulRegistry(opts ...Option) Registry {`
`81`	`84`	`if options.Secure \|\| options.TLSConfig != nil {`
`82`	`85`	`config.Scheme = "https"`
`83`	`86`	`// We're going to support InsecureSkipVerify`
`84`		`- if config.HttpClient == nil {`
`85`		`- config.HttpClient = new(http.Client)`
`86`		`- }`
`87`	`87`	`config.HttpClient.Transport = newTransport(options.TLSConfig)`
`88`	`88`	`}`
`89`	`89`