Apply options before we return for custom http

client.go

@@ -170,17 +170,20 @@ func createClient(options *ClientOptions, customHTTPClient *http.Client) (c *Cli
 	// Create a client
 	c = new(Client)
 
+	// Set options (either default or user modified)
+	if options == nil {
+		options = DefaultClientOptions()
+	}
+
+	// Set the options
+	c.Options = options
+
 	// Is there a custom HTTP client to use?
 	if customHTTPClient != nil {
 		c.httpClient = customHTTPClient
 		return
 	}
 
-	// Set options (either default or user modified)
-	if options == nil {
-		options = DefaultClientOptions()
-	}
-
 	// dial is the net dialer for clientDefaultTransport
 	dial := &net.Dialer{KeepAlive: options.DialerKeepAlive, Timeout: options.DialerTimeout}
 
@@ -194,9 +197,6 @@ func createClient(options *ClientOptions, customHTTPClient *http.Client) (c *Cli
 		TLSHandshakeTimeout:   options.TransportTLSHandshakeTimeout,
 	}
 
-	// Set the options
-	c.Options = options
-
 	// Determine the strategy for the http client
 	if options.RequestRetryCount <= 0 {