code review 4272045: http: export Transport, add keep-alive support

src/pkg/http/serve_test.go

 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // End-to-end serving tests
 
 package http_test
 
 import (
         "bufio"
@@ skipping 232 matching lines @@
                 fmt.Fprintf(res, "req=%d", reqNum)
         })
 
         const second = 1000000000 /* nanos */
         server := &Server{Handler: handler, ReadTimeout: 0.25 * second, WriteTimeout: 0.25 * second}
         go server.Serve(l)
 
         url := fmt.Sprintf("http://localhost:%d/", addr.Port)
 
         // Hit the HTTP server successfully.
-        r, _, err := Get(url)
+        tr := &Transport{DisableKeepAlives: true} // they interfere with this test
+        c := &Client{Transport: tr}
+        r, _, err := c.Get(url)
         if err != nil {
                 t.Fatalf("http Get #1: %v", err)
         }
         got, _ := ioutil.ReadAll(r.Body)
         expected := "req=1"
         if string(got) != expected {
                 t.Errorf("Unexpected response for request #1; got %q; expected %q",
                         string(got), expected)
         }
 
@@ skipping 64 matching lines @@
                 if cl, expected := res.ContentLength, int64(3); cl != expected {
                         t.Errorf("for %s expected res.ContentLength of %d; got %d", url, expected, cl)
                 }
                 if cl, expected := res.Header.Get("Content-Length"), "3"; cl != expected {
                         t.Errorf("for %s expected Content-Length header of %q; got %q", url, expected, cl)
                 }
                 if tl, expected := len(res.TransferEncoding), 0; tl != expected {
                         t.Errorf("for %s expected len(res.TransferEncoding) of %d; got %d (%v)",
                                 url, expected, tl, res.TransferEncoding)
                 }
+                res.Body.Close()
         }
 
         // Verify that ErrContentLength is returned
         url := ts.URL + "/?overwrite=1"
         _, _, err := Get(url)
         if err != nil {
                 t.Fatalf("error with Get of %s: %v", url, err)
         }
-
         // Verify that the connection is closed when the declared Content-Length
         // is larger than what the handler wrote.
         conn, err := net.Dial("tcp", "", ts.Listener.Addr().String())
         if err != nil {
                 t.Fatalf("error dialing: %v", err)
         }
         _, err = conn.Write([]byte("GET /?underwrite=1 HTTP/1.1\r\nHost: foo\r\n\r\n"))
         if err != nil {
                 t.Fatalf("error writing: %v", err)
         }
@@ skipping 86 matching lines @@
         if g, e := res.ContentLength, int64(-1); g != e {
                 t.Errorf("expected ContentLength of %d; got %d", e, g)
         }
         if g, e := res.TransferEncoding, []string{"chunked"}; !reflect.DeepEqual(g, e) {
                 t.Errorf("expected TransferEncoding of %v; got %v", e, g)
         }
         if _, haveCL := res.Header["Content-Length"]; haveCL {
                 t.Errorf("Unexpected Content-Length")
         }
 }