Merge pull request #111 from Fiery-Fenix/http-keep-alive-fix

Drain response body on exec call to enable keep-alive connection reuse
mailru · Feb 9, 2021 · 828678e · 828678e
2 parents e482166 + 70a1409
commit 828678e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/conn.go b/conn.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -211,6 +212,8 @@ func (c *conn) killQuery(req *http.Request, args []driver.Value) error {
 		return err
 	}
 	if body != nil {
+		// Drain body to enable connection reuse
+		io.Copy(ioutil.Discard, body)
 		body.Close()
 	}
 	return nil
@@ -248,6 +251,8 @@ func (c *conn) exec(ctx context.Context, query string, args []driver.Value) (dri
 	}
 	body, err := c.doRequest(ctx, req)
 	if body != nil {
+		// Drain body to enable connection reuse
+		io.Copy(ioutil.Discard, body)
 		body.Close()
 	}
 	return emptyResult, err

diff --git a/conn_go18.go b/conn_go18.go
@@ -29,6 +29,8 @@ func (c *conn) Ping(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	// Close response body to enable connection reuse
+	defer respBody.Close()
 	resp, err := ioutil.ReadAll(respBody)
 	if err != nil {
 		return err