fix review

Author: dunglas

src/net/http/httputil/reverseproxy.go

@@ -311,7 +311,6 @@ func (p *ReverseProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 		}
 	}
 
-	var headerSet bool
 	trace := &httptrace.ClientTrace{
 		Got1xxResponse: func(code int, header textproto.MIMEHeader) error {
 			h := rw.Header()
@@ -320,7 +319,7 @@ func (p *ReverseProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 
 			// Clear headers, it's not automatically done by ResponseWriter.WriteHeader() for 1xx responses
 			for k, _ := range h {
-				h.Del(k)
+				delete(h, k)
 			}
 
 			return nil
@@ -352,15 +351,7 @@ func (p *ReverseProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	if !p.modifyResponse(rw, res, outreq) {
 		return
 	}
-
-	h := rw.Header()
-	if headerSet {
-		for k, _ := range h {
-			h.Del(k)
-		}
-	}
-
-	copyHeader(h, res.Header)
+	copyHeader(rw.Header(), res.Header)
 
 	// The "Trailer" header isn't included in the Transport's response,
 	// at least for *http.Transport. Build it up from Trailer.

src/net/http/httputil/reverseproxy_test.go

@@ -1571,6 +1571,12 @@ func Test1xxResponses(t *testing.T) {
 		}
 
 		for i := range expected {
+			if i >= len(got) {
+				t.Errorf("Expected %q link header; got nothing", expected[i])
+
+				continue
+			}
+
 			if expected[i] != got[i] {
 				t.Errorf("Expected %q link header; got %q", expected[i], got[i])
 			}