Merge remote-tracking branch 'origin/main'

ClickHouse · Jun 6, 2023 · f5051e3 · f5051e3
2 parents 5ff2d11 + 6ba87b2
commit f5051e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -202,7 +202,7 @@ conn := clickhouse.OpenDB(&clickhouse.Options{
 	Compression: &clickhouse.Compression{
 		Method: clickhouse.CompressionLZ4,
 	},
-	Interface: clickhouse.HttpInterface,
+	Protocol:  clickhouse.HTTP,
 })
 ```
 
@@ -253,7 +253,7 @@ conn := clickhouse.OpenDB(&clickhouse.Options{
 		Username: "default",
 		Password: "",
 	},
-	Interface: clickhouse.HttpsInterface,
+	Protocol:  clickhouse.HTTP,
 })
 ```
 

diff --git a/conn_http.go b/conn_http.go
@@ -203,8 +203,7 @@ func dialHttp(ctx context.Context, addr string, num int, opt *Options) (*httpCon
 	t := &http.Transport{
 		Proxy: http.ProxyFromEnvironment,
 		DialContext: (&net.Dialer{
-			Timeout:   opt.DialTimeout,
-			KeepAlive: opt.ConnMaxLifetime,
+			Timeout: opt.DialTimeout,
 		}).DialContext,
 		MaxIdleConns:          1,
 		IdleConnTimeout:       opt.ConnMaxLifetime,