X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cb4efac6793d18892dde09c631895cb98c3df470..0e2f3e506566b1ceb54bd764d3f32c004e45f8b3:/lib/controller/proxy.go

diff --git a/lib/controller/proxy.go b/lib/controller/proxy.go
index c0b94c2b5f..13dfcac16a 100644
--- a/lib/controller/proxy.go
+++ b/lib/controller/proxy.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"git.curoverse.com/arvados.git/sdk/go/httpserver"
+	"git.arvados.org/arvados.git/sdk/go/httpserver"
 )
 
 type proxy struct {
@@ -25,20 +25,26 @@ func (h HTTPError) Error() string {
 	return h.Message
 }
 
-// headers that shouldn't be forwarded when proxying. See
-// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers
 var dropHeaders = map[string]bool{
+	// Headers that shouldn't be forwarded when proxying. See
+	// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers
 	"Connection":          true,
 	"Keep-Alive":          true,
 	"Proxy-Authenticate":  true,
 	"Proxy-Authorization": true,
-	// this line makes gofmt 1.10 and 1.11 agree
-	"TE":                true,
-	"Trailer":           true,
-	"Transfer-Encoding": true, // *-Encoding headers interfer with Go's automatic compression/decompression
-	"Content-Encoding":  true,
+	// (comment/space here makes gofmt1.10 agree with gofmt1.11)
+	"TE":      true,
+	"Trailer": true,
+	"Upgrade": true,
+
+	// Headers that would interfere with Go's automatic
+	// compression/decompression if we forwarded them.
 	"Accept-Encoding":   true,
-	"Upgrade":           true,
+	"Content-Encoding":  true,
+	"Transfer-Encoding": true,
+
+	// Content-Length depends on encoding.
+	"Content-Length": true,
 }
 
 type ResponseFilter func(*http.Response, error) (*http.Response, error)
@@ -74,9 +80,7 @@ func (p *proxy) Do(
 		Header: hdrOut,
 		Body:   reqIn.Body,
 	}).WithContext(reqIn.Context())
-
-	resp, err := client.Do(reqOut)
-	return resp, err
+	return client.Do(reqOut)
 }
 
 // Copy a response (or error) to the downstream client