Merge branch '9005-disable-keepalive'

refs #9005
refs #11726
refs #11729

diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 5e3e4afdb41f7a703b9bc1f978d203642d1aaea3..008876488b97aa675e30541754ec4e8c814ffe8f 100644 (file)
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -338,7 +338,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
        if client, ok := kc.Client.(*http.Client); ok && client.Transport != nil {
                // Workaround for https://dev.arvados.org/issues/9005
                if t, ok := client.Transport.(*http.Transport); ok {
-                       defer t.CloseIdleConnections()
+                       t.DisableKeepAlives = true
                }
        }
        rdr, err := kc.CollectionFileReader(collection, filename)