Merge lp:~pedronis/ubuntu-push/update-http13 into lp:ubuntu-push/automatic

[Samuele Pedroni]

update http13client from the actual go1.3 release

update http13client from the actual go1.3 release

[John Lenton (chipaca)]

LGTM.

review: Approve

[lp:~pedronis/ubuntu-push/update-http13]

187. By Samuele Pedroni on 2014-06-20

changelog

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-20 12:33:03 +0000
+++ debian/changelog	2014-06-20 13:24:39 +0000
@@ -3,6 +3,7 @@
   [ Samuele Pedroni ]
   * Support registering tokens and sending notifications with a token
   * Register script and scripts unicast support
+  * Update http13client from the actual go1.3 release
 
   [ Roberto Alsina ]
   * Make signing-helper generate a HTTP header instead of a querystring,
 
=== modified file 'http13client/Makefile'
--- http13client/Makefile	2014-03-20 12:15:36 +0000
+++ http13client/Makefile	2014-06-20 13:24:39 +0000
@@ -20,7 +20,8 @@
 
 prune:
 	rm -rf example_test.go filetransport*.go fs*.go race.go range_test.go \
-	sniff*.go httptest httputil testdata triv.go jar.go status.go
+	sniff*.go httptest httputil testdata triv.go jar.go status.go \
+	cookie_test.go
 	sed -i -e 's+"launchpad.net/ubuntu-push/http13client/+"net/http/+' *.go
 
 fix:
 
=== modified file 'http13client/_patches/empty_server.patch'
--- http13client/_patches/empty_server.patch	2014-03-19 23:13:58 +0000
+++ http13client/_patches/empty_server.patch	2014-06-20 13:24:39 +0000
@@ -1,6 +1,6 @@
 === modified file 'http13client/serve_test.go'
---- http13client/serve_test.go	2014-03-19 21:38:56 +0000
-+++ http13client/serve_test.go	2014-03-19 22:27:37 +0000
+--- http13client/serve_test.go	2014-06-20 11:00:47 +0000
++++ http13client/serve_test.go	2014-06-20 12:00:22 +0000
 @@ -2,60 +2,15 @@
  // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
@@ -62,7 +62,7 @@
  
  func (a dummyAddr) Network() string {
  	return string(a)
-@@ -93,1289 +48,6 @@
+@@ -93,1325 +48,6 @@
  	return nil
  }
  
@@ -906,31 +906,50 @@
 -}
 -
 -type serverExpectTest struct {
--	contentLength    int    // of request body
+-	contentLength    int // of request body
+-	chunked          bool
 -	expectation      string // e.g. "100-continue"
 -	readBody         bool   // whether handler should read the body (if false, sends StatusUnauthorized)
 -	expectedResponse string // expected substring in first line of http response
 -}
 -
+-func expectTest(contentLength int, expectation string, readBody bool, expectedResponse string) serverExpectTest {
+-	return serverExpectTest{
+-		contentLength:    contentLength,
+-		expectation:      expectation,
+-		readBody:         readBody,
+-		expectedResponse: expectedResponse,
+-	}
+-}
+-
 -var serverExpectTests = []serverExpectTest{
 -	// Normal 100-continues, case-insensitive.
--	{100, "100-continue", true, "100 Continue"},
--	{100, "100-cOntInUE", true, "100 Continue"},
+-	expectTest(100, "100-continue", true, "100 Continue"),
+-	expectTest(100, "100-cOntInUE", true, "100 Continue"),
 -
 -	// No 100-continue.
--	{100, "", true, "200 OK"},
+-	expectTest(100, "", true, "200 OK"),
 -
 -	// 100-continue but requesting client to deny us,
 -	// so it never reads the body.
--	{100, "100-continue", false, "401 Unauthorized"},
+-	expectTest(100, "100-continue", false, "401 Unauthorized"),
 -	// Likewise without 100-continue:
--	{100, "", false, "401 Unauthorized"},
+-	expectTest(100, "", false, "401 Unauthorized"),
 -
 -	// Non-standard expectations are failures
--	{0, "a-pony", false, "417 Expectation Failed"},
+-	expectTest(0, "a-pony", false, "417 Expectation Failed"),
 -
--	// Expect-100 requested but no body
--	{0, "100-continue", true, "400 Bad Request"},
+-	// Expect-100 requested but no body (is apparently okay: Issue 7625)
+-	expectTest(0, "100-continue", true, "200 OK"),
+-	// Expect-100 requested but handler doesn't read the body
+-	expectTest(0, "100-continue", false, "401 Unauthorized"),
+-	// Expect-100 continue with no body, but a chunked body.
+-	{
+-		expectation:      "100-continue",
+-		readBody:         true,
+-		chunked:          true,
+-		expectedResponse: "100 Continue",
+-	},
 -}
 -
 -// Tests that the server responds to the "Expect" request header
@@ -959,21 +978,38 @@
 -
 -		// Only send the body immediately if we're acting like an HTTP client
 -		// that doesn't send 100-continue expectations.
--		writeBody := test.contentLength > 0 && strings.ToLower(test.expectation) != "100-continue"
+-		writeBody := test.contentLength != 0 && strings.ToLower(test.expectation) != "100-continue"
 -
 -		go func() {
+-			contentLen := fmt.Sprintf("Content-Length: %d", test.contentLength)
+-			if test.chunked {
+-				contentLen = "Transfer-Encoding: chunked"
+-			}
 -			_, err := fmt.Fprintf(conn, "POST /?readbody=%v HTTP/1.1\r\n"+
 -				"Connection: close\r\n"+
--				"Content-Length: %d\r\n"+
+-				"%s\r\n"+
 -				"Expect: %s\r\nHost: foo\r\n\r\n",
--				test.readBody, test.contentLength, test.expectation)
+-				test.readBody, contentLen, test.expectation)
 -			if err != nil {
 -				t.Errorf("On test %#v, error writing request headers: %v", test, err)
 -				return
 -			}
 -			if writeBody {
+-				var targ io.WriteCloser = struct {
+-					io.Writer
+-					io.Closer
+-				}{
+-					conn,
+-					ioutil.NopCloser(nil),
+-				}
+-				if test.chunked {
+-					targ = httputil.NewChunkedWriter(conn)
+-				}
 -				body := strings.Repeat("A", test.contentLength)
--				_, err = fmt.Fprint(conn, body)
+-				_, err = fmt.Fprint(targ, body)
+-				if err == nil {
+-					err = targ.Close()
+-				}
 -				if err != nil {
 -					if !test.readBody {
 -						// Server likely already hung up on us.
@@ -1352,7 +1388,7 @@
  type neverEnding byte
  
  func (b neverEnding) Read(p []byte) (n int, err error) {
-@@ -1384,1344 +56,3 @@
+@@ -1420,1392 +56,3 @@
  	}
  	return len(p), nil
  }
@@ -2080,7 +2116,7 @@
 -			got := ht.rawResponse(req)
 -			wantStatus := fmt.Sprintf("%d %s", code, StatusText(code))
 -			if !strings.Contains(got, wantStatus) {
--				t.Errorf("Code %d: Wanted %q Modified for %q: %s", code, req, got)
+-				t.Errorf("Code %d: Wanted %q Modified for %q: %s", code, wantStatus, req, got)
 -			} else if strings.Contains(got, "Content-Length") {
 -				t.Errorf("Code %d: Got a Content-Length from %q: %s", code, req, got)
 -			} else if strings.Contains(got, "stuff") {
@@ -2090,6 +2126,21 @@
 -	}
 -}
 -
+-func TestContentTypeOkayOn204(t *testing.T) {
+-	ht := newHandlerTest(HandlerFunc(func(w ResponseWriter, r *Request) {
+-		w.Header().Set("Content-Length", "123") // suppressed
+-		w.Header().Set("Content-Type", "foo/bar")
+-		w.WriteHeader(204)
+-	}))
+-	got := ht.rawResponse("GET / HTTP/1.1")
+-	if !strings.Contains(got, "Content-Type: foo/bar") {
+-		t.Errorf("Response = %q; want Content-Type: foo/bar", got)
+-	}
+-	if strings.Contains(got, "Content-Length: 123") {
+-		t.Errorf("Response = %q; don't want a Content-Length", got)
+-	}
+-}
+-
 -// Issue 6995
 -// A server Handler can receive a Request, and then turn around and
 -// give a copy of that Request.Body out to the Transport (e.g. any
@@ -2261,7 +2312,7 @@
 -	ts.Config.ErrorLog = log.New(ioutil.Discard, "", 0)
 -	ts.Config.ConnState = func(c net.Conn, state ConnState) {
 -		if c == nil {
--			t.Error("nil conn seen in state %s", state)
+-			t.Errorf("nil conn seen in state %s", state)
 -			return
 -		}
 -		mu.Lock()
@@ -2397,6 +2448,39 @@
 -	}
 -}
 -
+-// golang.org/issue/7856
+-func TestServerEmptyBodyRace(t *testing.T) {
+-	defer afterTest(t)
+-	var n int32
+-	ts := httptest.NewServer(HandlerFunc(func(rw ResponseWriter, req *Request) {
+-		atomic.AddInt32(&n, 1)
+-	}))
+-	defer ts.Close()
+-	var wg sync.WaitGroup
+-	const reqs = 20
+-	for i := 0; i < reqs; i++ {
+-		wg.Add(1)
+-		go func() {
+-			defer wg.Done()
+-			res, err := Get(ts.URL)
+-			if err != nil {
+-				t.Error(err)
+-				return
+-			}
+-			defer res.Body.Close()
+-			_, err = io.Copy(ioutil.Discard, res.Body)
+-			if err != nil {
+-				t.Error(err)
+-				return
+-			}
+-		}()
+-	}
+-	wg.Wait()
+-	if got := atomic.LoadInt32(&n); got != reqs {
+-		t.Errorf("handler ran %d times; want %d", got, reqs)
+-	}
+-}
+-
 -func TestServerConnStateNew(t *testing.T) {
 -	sawNew := false // if the test is buggy, we'll race on this variable.
 -	srv := &Server{
@@ -2699,9 +2783,9 @@
 -}
 
 === modified file 'http13client/server.go'
---- http13client/server.go	2014-03-19 20:20:19 +0000
-+++ http13client/server.go	2014-03-19 22:27:37 +0000
-@@ -2,1984 +2,17 @@
+--- http13client/server.go	2014-06-20 11:00:47 +0000
++++ http13client/server.go	2014-06-20 12:05:53 +0000
+@@ -2,1976 +2,16 @@
  // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
  
@@ -2723,7 +2807,7 @@
 -	"path"
 -	"runtime"
 -	"strconv"
- 	"strings"
+-	"strings"
  	"sync"
 -	"sync/atomic"
 -	"time"
@@ -3506,18 +3590,16 @@
 -	}
 -
 -	code := w.status
--	if !bodyAllowedForStatus(code) {
--		// Must not have body.
--		// RFC 2616 section 10.3.5: "the response MUST NOT include other entity-headers"
--		for _, k := range []string{"Content-Type", "Content-Length", "Transfer-Encoding"} {
--			delHeader(k)
--		}
--	} else {
+-	if bodyAllowedForStatus(code) {
 -		// If no content type, apply sniffing algorithm to body.
 -		_, haveType := header["Content-Type"]
 -		if !haveType {
 -			setHeader.contentType = DetectContentType(p)
 -		}
+-	} else {
+-		for _, k := range suppressedHeaders(code) {
+-			delHeader(k)
+-		}
 -	}
 -
 -	if _, ok := header["Date"]; !ok {
@@ -3865,16 +3947,10 @@
 -		// Expect 100 Continue support
 -		req := w.req
 -		if req.expectsContinue() {
--			if req.ProtoAtLeast(1, 1) {
+-			if req.ProtoAtLeast(1, 1) && req.ContentLength != 0 {
 -				// Wrap the Body reader with one that replies on the connection
 -				req.Body = &expectContinueReader{readCloser: req.Body, resp: w}
 -			}
--			if req.ContentLength == 0 {
--				w.Header().Set("Connection", "close")
--				w.WriteHeader(StatusBadRequest)
--				w.finishRequest()
--				break
--			}
 -			req.Header.Del("Expect")
 -		} else if req.Header.get("Expect") != "" {
 -			w.sendExpectationFailed()
@@ -4685,11 +4761,11 @@
 -}
 +)
  
- // eofReader is a non-nil io.ReadCloser that always returns EOF.
- // It embeds a *strings.Reader so it still has a WriteTo method
-@@ -1992,28 +25,6 @@
- 	ioutil.NopCloser(nil),
- }
+ type eofReaderWithWriteTo struct{}
+ 
+@@ -1991,28 +31,6 @@
+ // Verify that an io.Copy from an eofReader won't require a buffer.
+ var _ io.WriterTo = eofReader
  
 -// initNPNRequest is an HTTP handler that initializes certain
 -// uninitialized fields in its *Request. Such partially-initialized
 
=== modified file 'http13client/_patches/fix_code.patch'
--- http13client/_patches/fix_code.patch	2014-03-19 23:13:58 +0000
+++ http13client/_patches/fix_code.patch	2014-06-20 13:24:39 +0000
@@ -1,6 +1,6 @@
 === modified file 'http13client/client.go'
---- http13client/client.go	2014-03-19 20:20:19 +0000
-+++ http13client/client.go	2014-03-19 22:27:37 +0000
+--- http13client/client.go	2014-06-20 11:00:47 +0000
++++ http13client/client.go	2014-06-20 12:05:53 +0000
 @@ -17,6 +17,7 @@
  	"io/ioutil"
  	"log"
@@ -18,7 +18,7 @@
  
  	// Timeout specifies a time limit for requests made by this
  	// Client. The timeout includes connection time, any
-@@ -177,7 +178,7 @@
+@@ -184,7 +185,7 @@
  	// Headers, leaving it uninitialized.  We guarantee to the
  	// Transport that this has been initialized, though.
  	if req.Header == nil {
@@ -27,7 +27,7 @@
  	}
  
  	if u := req.URL.User; u != nil {
-@@ -308,7 +309,7 @@
+@@ -316,7 +317,7 @@
  			if ireq.Method == "POST" || ireq.Method == "PUT" {
  				nreq.Method = "GET"
  			}
@@ -38,8 +38,8 @@
  				break
 
 === modified file 'http13client/cookie.go'
---- http13client/cookie.go	2014-03-19 20:20:19 +0000
-+++ http13client/cookie.go	2014-03-19 22:27:37 +0000
+--- http13client/cookie.go	2014-06-20 11:00:47 +0000
++++ http13client/cookie.go	2014-06-20 12:05:53 +0000
 @@ -5,10 +5,9 @@
  package http
  
@@ -94,7 +94,7 @@
  			Name:  name,
  			Value: value,
  			Raw:   line,
-@@ -129,59 +108,12 @@
+@@ -125,59 +104,12 @@
  	return cookies
  }
  
@@ -156,7 +156,7 @@
  	lines, ok := h["Cookie"]
  	if !ok {
  		return cookies
-@@ -213,7 +145,7 @@
+@@ -209,7 +141,7 @@
  			if !success {
  				continue
  			}
@@ -167,8 +167,8 @@
  	}
 
 === modified file 'http13client/header.go'
---- http13client/header.go	2014-03-19 20:20:19 +0000
-+++ http13client/header.go	2014-03-19 22:27:37 +0000
+--- http13client/header.go	2014-06-20 11:00:47 +0000
++++ http13client/header.go	2014-06-20 12:00:22 +0000
 @@ -5,176 +5,9 @@
  package http
  
@@ -348,8 +348,8 @@
  // token must be all lowercase.
 
 === modified file 'http13client/request.go'
---- http13client/request.go	2014-03-19 20:20:19 +0000
-+++ http13client/request.go	2014-03-19 22:27:37 +0000
+--- http13client/request.go	2014-06-20 11:00:47 +0000
++++ http13client/request.go	2014-06-20 12:05:53 +0000
 @@ -16,6 +16,7 @@
  	"io/ioutil"
  	"mime"
@@ -358,25 +358,25 @@
  	"net/textproto"
  	"net/url"
  	"strconv"
-@@ -103,7 +104,7 @@
- 	// The request parser implements this by canonicalizing the
- 	// name, making the first character and any characters
- 	// following a hyphen uppercase and the rest lowercase.
+@@ -121,7 +122,7 @@
+ 	// added and may override values in Header.
+ 	//
+ 	// See the documentation for the Request.Write method.
 -	Header Header
 +	Header http.Header
  
  	// Body is the request's body.
  	//
-@@ -164,7 +165,7 @@
- 	// For server requests, Trailer is only populated after Body has been
- 	// closed or fully consumed.
- 	// Trailer support is only partially complete.
+@@ -199,7 +200,7 @@
+ 	// not mutate Trailer.
+ 	//
+ 	// Few HTTP clients, servers, or proxies support HTTP trailers.
 -	Trailer Header
 +	Trailer http.Header
  
  	// RemoteAddr allows HTTP servers and other software to record
  	// the network address that sent the request, usually for
-@@ -204,7 +205,7 @@
+@@ -239,7 +240,7 @@
  }
  
  // Cookies parses and returns the HTTP cookies sent with the request.
@@ -385,7 +385,7 @@
  	return readCookies(r.Header, "")
  }
  
-@@ -212,7 +213,7 @@
+@@ -247,7 +248,7 @@
  
  // Cookie returns the named cookie provided in the request or
  // ErrNoCookie if not found.
@@ -394,7 +394,7 @@
  	for _, c := range readCookies(r.Header, name) {
  		return c, nil
  	}
-@@ -223,7 +224,7 @@
+@@ -258,7 +259,7 @@
  // AddCookie does not attach more than one Cookie header field.  That
  // means all cookies, if any, are written into the same line,
  // separated by semicolon.
@@ -403,7 +403,7 @@
  	s := fmt.Sprintf("%s=%s", sanitizeCookieName(c.Name), sanitizeCookieValue(c.Value))
  	if c := r.Header.Get("Cookie"); c != "" {
  		r.Header.Set("Cookie", c+"; "+s)
-@@ -326,7 +327,7 @@
+@@ -361,7 +362,7 @@
  }
  
  // extraHeaders may be nil
@@ -412,7 +412,7 @@
  	host := req.Host
  	if host == "" {
  		if req.URL == nil {
-@@ -456,7 +457,7 @@
+@@ -490,7 +491,7 @@
  		Proto:      "HTTP/1.1",
  		ProtoMajor: 1,
  		ProtoMinor: 1,
@@ -421,7 +421,7 @@
  		Body:       rc,
  		Host:       u.Host,
  	}
-@@ -571,7 +572,7 @@
+@@ -605,7 +606,7 @@
  	if err != nil {
  		return nil, err
  	}
@@ -430,7 +430,7 @@
  
  	// RFC2616: Must treat
  	//	GET /index.html HTTP/1.1
-@@ -582,7 +583,7 @@
+@@ -616,7 +617,7 @@
  	// the same.  In the second case, any Host line is ignored.
  	req.Host = req.URL.Host
  	if req.Host == "" {
@@ -439,7 +439,7 @@
  	}
  	delete(req.Header, "Host")
  
-@@ -630,12 +631,12 @@
+@@ -638,12 +639,12 @@
  //
  // MaxBytesReader prevents clients from accidentally or maliciously
  // sending a large request and wasting server resources.
@@ -454,7 +454,7 @@
  	r       io.ReadCloser // underlying reader
  	n       int64         // max bytes remaining
  	stopped bool
-@@ -645,9 +646,6 @@
+@@ -653,9 +654,6 @@
  	if l.n <= 0 {
  		if !l.stopped {
  			l.stopped = true
@@ -464,7 +464,7 @@
  		}
  		return 0, errors.New("http: request body too large")
  	}
-@@ -852,16 +850,16 @@
+@@ -858,18 +856,18 @@
  }
  
  func (r *Request) expectsContinue() bool {
@@ -484,11 +484,13 @@
 -	return hasToken(r.Header.get("Connection"), "close")
 +	return hasToken(r.Header.Get("Connection"), "close")
  }
+ 
+ func (r *Request) closeBody() {
 
 === modified file 'http13client/response.go'
---- http13client/response.go	2014-03-19 20:20:19 +0000
-+++ http13client/response.go	2014-03-19 22:27:37 +0000
-@@ -11,6 +11,7 @@
+--- http13client/response.go	2014-06-20 11:00:47 +0000
++++ http13client/response.go	2014-06-20 12:05:53 +0000
+@@ -12,6 +12,7 @@
  	"crypto/tls"
  	"errors"
  	"io"
@@ -496,7 +498,7 @@
  	"net/textproto"
  	"net/url"
  	"strconv"
-@@ -40,7 +41,7 @@
+@@ -41,7 +42,7 @@
  	// omitted from Header.
  	//
  	// Keys in the map are canonicalized (see CanonicalHeaderKey).
@@ -505,7 +507,7 @@
  
  	// Body represents the response body.
  	//
-@@ -69,7 +70,7 @@
+@@ -71,7 +72,7 @@
  
  	// Trailer maps trailer keys to values, in the same
  	// format as the header.
@@ -514,7 +516,7 @@
  
  	// The Request that was sent to obtain this Response.
  	// Request's Body is nil (having already been consumed).
-@@ -84,7 +85,7 @@
+@@ -86,7 +87,7 @@
  }
  
  // Cookies parses and returns the cookies set in the Set-Cookie headers.
@@ -523,7 +525,7 @@
  	return readSetCookies(r.Header)
  }
  
-@@ -153,7 +154,7 @@
+@@ -155,7 +156,7 @@
  		}
  		return nil, err
  	}
@@ -532,7 +534,7 @@
  
  	fixPragmaCacheControl(resp.Header)
  
-@@ -169,7 +170,7 @@
+@@ -171,7 +172,7 @@
  //	Pragma: no-cache
  // like
  //	Cache-Control: no-cache
@@ -543,17 +545,17 @@
  			header["Cache-Control"] = []string{"no-cache"}
 
 === modified file 'http13client/transfer.go'
---- http13client/transfer.go	2014-03-19 20:20:19 +0000
-+++ http13client/transfer.go	2014-03-19 22:27:37 +0000
+--- http13client/transfer.go	2014-06-20 11:00:47 +0000
++++ http13client/transfer.go	2014-06-20 12:05:53 +0000
 @@ -11,6 +11,7 @@
  	"fmt"
  	"io"
  	"io/ioutil"
 +	"net/http"
  	"net/textproto"
+ 	"sort"
  	"strconv"
- 	"strings"
-@@ -36,7 +37,7 @@
+@@ -37,7 +38,7 @@
  	ContentLength    int64 // -1 means unknown, 0 means exactly none
  	Close            bool
  	TransferEncoding []string
@@ -562,16 +564,16 @@
  }
  
  func newTransferWriter(r interface{}) (t *transferWriter, err error) {
-@@ -174,7 +175,7 @@
- 		io.WriteString(w, "Trailer: ")
- 		needComma := false
+@@ -171,7 +172,7 @@
+ 	if t.Trailer != nil {
+ 		keys := make([]string, 0, len(t.Trailer))
  		for k := range t.Trailer {
 -			k = CanonicalHeaderKey(k)
 +			k = http.CanonicalHeaderKey(k)
  			switch k {
  			case "Transfer-Encoding", "Trailer", "Content-Length":
  				return &badStringError{"invalid Trailer key", k}
-@@ -237,7 +238,7 @@
+@@ -243,7 +244,7 @@
  
  type transferReader struct {
  	// Input
@@ -580,7 +582,7 @@
  	StatusCode    int
  	RequestMethod string
  	ProtoMajor    int
-@@ -247,7 +248,7 @@
+@@ -253,7 +254,7 @@
  	ContentLength    int64
  	TransferEncoding []string
  	Close            bool
@@ -589,7 +591,7 @@
  }
  
  // bodyAllowedForStatus reports whether a given response status code
-@@ -308,7 +309,7 @@
+@@ -330,7 +331,7 @@
  		return err
  	}
  	if isResponse && t.RequestMethod == "HEAD" {
@@ -598,7 +600,7 @@
  			return err
  		} else {
  			t.ContentLength = n
-@@ -386,7 +387,7 @@
+@@ -408,7 +409,7 @@
  func isIdentity(te []string) bool { return len(te) == 1 && te[0] == "identity" }
  
  // Sanitize transfer encoding
@@ -607,7 +609,7 @@
  	raw, present := header["Transfer-Encoding"]
  	if !present {
  		return nil, nil
-@@ -429,7 +430,7 @@
+@@ -451,7 +452,7 @@
  // Determine the expected body length, using RFC 2616 Section 4.4. This
  // function is not a method, because ultimately it should be shared by
  // ReadResponse and ReadRequest.
@@ -616,7 +618,7 @@
  
  	// Logic based on response type or status
  	if noBodyExpected(requestMethod) {
-@@ -449,7 +450,7 @@
+@@ -471,7 +472,7 @@
  	}
  
  	// Logic based on Content-Length
@@ -625,7 +627,7 @@
  	if cl != "" {
  		n, err := parseContentLength(cl)
  		if err != nil {
-@@ -475,18 +476,18 @@
+@@ -497,18 +498,18 @@
  // Determine whether to hang up after sending a request and body, or
  // receiving a response and body
  // 'header' is the request headers
@@ -647,7 +649,7 @@
  			header.Del("Connection")
  			return true
  		}
-@@ -495,17 +496,17 @@
+@@ -517,17 +518,17 @@
  }
  
  // Parse the trailer header
@@ -669,22 +671,28 @@
  		switch key {
  		case "Transfer-Encoding", "Trailer", "Content-Length":
  			return nil, &badStringError{"bad trailer key", key}
-@@ -642,9 +643,9 @@
+@@ -664,14 +665,14 @@
  	}
  	switch rr := b.hdr.(type) {
  	case *Request:
--		rr.Trailer = Header(hdr)
-+		rr.Trailer = http.Header(hdr)
+-		mergeSetHeader(&rr.Trailer, Header(hdr))
++		mergeSetHeader(&rr.Trailer, http.Header(hdr))
  	case *Response:
--		rr.Trailer = Header(hdr)
-+		rr.Trailer = http.Header(hdr)
+-		mergeSetHeader(&rr.Trailer, Header(hdr))
++		mergeSetHeader(&rr.Trailer, http.Header(hdr))
  	}
  	return nil
  }
+ 
+-func mergeSetHeader(dst *Header, src Header) {
++func mergeSetHeader(dst *http.Header, src http.Header) {
+ 	if *dst == nil {
+ 		*dst = src
+ 		return
 
 === modified file 'http13client/transport.go'
---- http13client/transport.go	2014-03-19 20:20:19 +0000
-+++ http13client/transport.go	2014-03-19 22:27:37 +0000
+--- http13client/transport.go	2014-06-20 11:00:47 +0000
++++ http13client/transport.go	2014-06-20 12:05:53 +0000
 @@ -18,6 +18,7 @@
  	"io"
  	"log"
@@ -693,7 +701,7 @@
  	"net/url"
  	"os"
  	"strings"
-@@ -144,12 +145,12 @@
+@@ -147,12 +148,12 @@
  // optional extra headers to write.
  type transportRequest struct {
  	*Request        // original request, not to be mutated
@@ -709,7 +717,7 @@
  	}
  	return tr.extra
  }
-@@ -512,7 +513,7 @@
+@@ -519,7 +520,7 @@
  	case cm.targetScheme == "http":
  		pconn.isProxy = true
  		if pa != "" {
@@ -718,7 +726,7 @@
  				h.Set("Proxy-Authorization", pa)
  			}
  		}
-@@ -521,7 +522,7 @@
+@@ -528,7 +529,7 @@
  			Method: "CONNECT",
  			URL:    &url.URL{Opaque: cm.targetAddr},
  			Host:   cm.targetAddr,
@@ -727,7 +735,7 @@
  		}
  		if pa != "" {
  			connectReq.Header.Set("Proxy-Authorization", pa)
-@@ -735,7 +736,7 @@
+@@ -748,7 +749,7 @@
  	// mutateHeaderFunc is an optional func to modify extra
  	// headers on each outbound request before it's written. (the
  	// original Request given to RoundTrip is not modified)
@@ -735,5 +743,5 @@
 +	mutateHeaderFunc func(http.Header)
  }
  
- func (pc *persistConn) isBroken() bool {
+ // isBroken reports whether this connection is in a known broken state.
 
 
=== modified file 'http13client/_patches/fix_status.patch'
--- http13client/_patches/fix_status.patch	2014-03-19 23:43:25 +0000
+++ http13client/_patches/fix_status.patch	2014-06-20 13:24:39 +0000
@@ -1,7 +1,7 @@
 === modified file 'http13client/client.go'
---- http13client/client.go	2014-03-19 23:13:58 +0000
-+++ http13client/client.go	2014-03-19 23:38:11 +0000
-@@ -210,7 +210,7 @@
+--- http13client/client.go	2014-06-20 12:46:25 +0000
++++ http13client/client.go	2014-06-20 12:46:45 +0000
+@@ -217,7 +217,7 @@
  // automatically redirect.
  func shouldRedirectGet(statusCode int) bool {
  	switch statusCode {
@@ -10,7 +10,7 @@
  		return true
  	}
  	return false
-@@ -220,7 +220,7 @@
+@@ -227,7 +227,7 @@
  // automatically redirect.
  func shouldRedirectPost(statusCode int) bool {
  	switch statusCode {
@@ -21,9 +21,9 @@
  	return false
 
 === modified file 'http13client/client_test.go'
---- http13client/client_test.go	2014-03-19 23:13:58 +0000
-+++ http13client/client_test.go	2014-03-19 23:39:48 +0000
-@@ -202,7 +202,7 @@
+--- http13client/client_test.go	2014-06-20 12:46:25 +0000
++++ http13client/client_test.go	2014-06-20 12:46:45 +0000
+@@ -204,7 +204,7 @@
  			}
  		}
  		if n < 15 {
@@ -32,7 +32,7 @@
  			return
  		}
  		fmt.Fprintf(w, "n=%d", n)
-@@ -324,7 +324,7 @@
+@@ -326,7 +326,7 @@
  	}
  	if r.URL.Path == "/" {
  		http.SetCookie(w, expectedCookies[1])
@@ -41,7 +41,7 @@
  	} else {
  		http.SetCookie(w, expectedCookies[2])
  		w.Write([]byte("hello"))
-@@ -783,7 +783,7 @@
+@@ -785,7 +785,7 @@
  	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
  		if r.URL.Path == "/" {
  			sawRoot <- true
@@ -50,7 +50,7 @@
  			return
  		}
  		if r.URL.Path == "/slow" {
-@@ -844,7 +844,7 @@
+@@ -846,7 +846,7 @@
  	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
  		saw <- r.RemoteAddr
  		if r.URL.Path == "/" {
@@ -61,9 +61,9 @@
  	defer ts.Close()
 
 === modified file 'http13client/request_test.go'
---- http13client/request_test.go	2014-03-19 23:13:58 +0000
-+++ http13client/request_test.go	2014-03-19 23:40:12 +0000
-@@ -164,11 +164,11 @@
+--- http13client/request_test.go	2014-06-20 12:46:25 +0000
++++ http13client/request_test.go	2014-06-20 12:46:45 +0000
+@@ -182,11 +182,11 @@
  		switch r.URL.Path {
  		case "/":
  			w.Header().Set("Location", "/foo/")
@@ -79,9 +79,9 @@
  	defer ts.Close()
 
 === modified file 'http13client/response.go'
---- http13client/response.go	2014-03-19 23:13:58 +0000
-+++ http13client/response.go	2014-03-19 23:38:56 +0000
-@@ -204,9 +204,8 @@
+--- http13client/response.go	2014-06-20 12:46:25 +0000
++++ http13client/response.go	2014-06-20 12:46:45 +0000
+@@ -205,9 +205,8 @@
  	// Status line
  	text := r.Status
  	if text == "" {
@@ -94,10 +94,23 @@
  		}
  	}
 
+=== modified file 'http13client/responsewrite_test.go'
+--- http13client/responsewrite_test.go	2014-06-20 12:46:25 +0000
++++ http13client/responsewrite_test.go	2014-06-20 12:47:05 +0000
+@@ -197,7 +197,7 @@
+ 		// there were two.
+ 		{
+ 			Response{
+-				StatusCode:       StatusOK,
++				StatusCode:       http.StatusOK,
+ 				ProtoMajor:       1,
+ 				ProtoMinor:       1,
+ 				Request:          &Request{Method: "POST"},
+
 === modified file 'http13client/transport_test.go'
---- http13client/transport_test.go	2014-03-19 23:13:58 +0000
-+++ http13client/transport_test.go	2014-03-19 23:40:39 +0000
-@@ -968,7 +968,7 @@
+--- http13client/transport_test.go	2014-06-20 12:46:25 +0000
++++ http13client/transport_test.go	2014-06-20 12:46:45 +0000
+@@ -1004,7 +1004,7 @@
  	defer afterTest(t)
  	const deniedMsg = "sorry, denied."
  	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -106,7 +119,7 @@
  	}))
  	defer ts.Close()
  	tr := &Transport{}
-@@ -992,7 +992,7 @@
+@@ -1028,7 +1028,7 @@
  func TestChunkedNoContent(t *testing.T) {
  	defer afterTest(t)
  	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 
=== modified file 'http13client/_patches/fix_tests.patch'
--- http13client/_patches/fix_tests.patch	2014-03-19 23:13:58 +0000
+++ http13client/_patches/fix_tests.patch	2014-06-20 13:24:39 +0000
@@ -1,6 +1,6 @@
 === modified file 'http13client/client_test.go'
---- http13client/client_test.go	2014-03-19 21:38:56 +0000
-+++ http13client/client_test.go	2014-03-19 22:27:37 +0000
+--- http13client/client_test.go	2014-06-20 11:00:47 +0000
++++ http13client/client_test.go	2014-06-20 12:05:53 +0000
 @@ -15,8 +15,8 @@
  	"fmt"
  	"io"
@@ -11,7 +11,7 @@
  	. "launchpad.net/ubuntu-push/http13client"
  	"net/http/httptest"
  	"net/url"
-@@ -27,7 +27,7 @@
+@@ -29,7 +29,7 @@
  	"time"
  )
  
@@ -20,7 +20,7 @@
  	w.Header().Set("Last-Modified", "sometime")
  	fmt.Fprintf(w, "User-agent: go\nDisallow: /something/")
  })
-@@ -193,7 +193,7 @@
+@@ -195,7 +195,7 @@
  func TestClientRedirects(t *testing.T) {
  	defer afterTest(t)
  	var ts *httptest.Server
@@ -29,7 +29,7 @@
  		n, _ := strconv.Atoi(r.FormValue("n"))
  		// Test Referer header. (7 is arbitrary position to test at)
  		if n == 7 {
-@@ -202,7 +202,7 @@
+@@ -204,7 +204,7 @@
  			}
  		}
  		if n < 15 {
@@ -38,7 +38,7 @@
  			return
  		}
  		fmt.Fprintf(w, "n=%d", n)
-@@ -271,7 +271,7 @@
+@@ -273,7 +273,7 @@
  		bytes.Buffer
  	}
  	var ts *httptest.Server
@@ -47,7 +47,7 @@
  		log.Lock()
  		fmt.Fprintf(&log.Buffer, "%s %s ", r.Method, r.RequestURI)
  		log.Unlock()
-@@ -312,21 +312,21 @@
+@@ -314,21 +314,21 @@
  	}
  }
  
@@ -75,7 +75,7 @@
  		w.Write([]byte("hello"))
  	}
  })
-@@ -334,7 +334,7 @@
+@@ -336,7 +336,7 @@
  func TestClientSendsCookieFromJar(t *testing.T) {
  	tr := &recordingTransport{}
  	client := &Client{Transport: tr}
@@ -84,7 +84,7 @@
  	us := "http://dummy.faketld/"
  	u, _ := url.Parse(us)
  	client.Jar.SetCookies(u, expectedCookies)
-@@ -364,19 +364,19 @@
+@@ -366,19 +366,19 @@
  // scope of all cookies.
  type TestJar struct {
  	m      sync.Mutex
@@ -108,7 +108,7 @@
  	j.m.Lock()
  	defer j.m.Unlock()
  	return j.perURL[u.Host]
-@@ -391,7 +391,7 @@
+@@ -393,7 +393,7 @@
  		Jar: new(TestJar),
  	}
  	u, _ := url.Parse(ts.URL)
@@ -117,7 +117,7 @@
  	resp, err := c.Get(ts.URL)
  	if err != nil {
  		t.Fatalf("Get: %v", err)
-@@ -400,7 +400,7 @@
+@@ -402,7 +402,7 @@
  	matchReturnedCookies(t, expectedCookies, resp.Cookies())
  }
  
@@ -126,7 +126,7 @@
  	if len(given) != len(expected) {
  		t.Logf("Received cookies: %v", given)
  		t.Errorf("Expected %d cookies, got %d", len(expected), len(given))
-@@ -421,14 +421,14 @@
+@@ -423,14 +423,14 @@
  
  func TestJarCalls(t *testing.T) {
  	defer afterTest(t)
@@ -144,7 +144,7 @@
  		}
  	}))
  	defer ts.Close()
-@@ -468,11 +468,11 @@
+@@ -470,11 +470,11 @@
  	log bytes.Buffer
  }
  
@@ -158,7 +158,7 @@
  	j.logf("Cookies(%q)\n", u)
  	return nil
  }
-@@ -486,11 +486,11 @@
+@@ -488,11 +488,11 @@
  func TestStreamingGet(t *testing.T) {
  	defer afterTest(t)
  	say := make(chan string)
@@ -173,7 +173,7 @@
  		}
  	}))
  	defer ts.Close()
-@@ -536,7 +536,7 @@
+@@ -538,7 +538,7 @@
  // don't send a TCP packet per line of the http request + body.
  func TestClientWrites(t *testing.T) {
  	defer afterTest(t)
@@ -182,7 +182,7 @@
  	}))
  	defer ts.Close()
  
-@@ -568,46 +568,6 @@
+@@ -570,46 +570,6 @@
  	}
  }
  
@@ -229,7 +229,7 @@
  func TestClientErrorWithRequestURI(t *testing.T) {
  	defer afterTest(t)
  	req, _ := NewRequest("GET", "http://localhost:1234/", nil)
-@@ -639,7 +599,7 @@
+@@ -641,7 +601,7 @@
  
  func TestClientWithCorrectTLSServerName(t *testing.T) {
  	defer afterTest(t)
@@ -238,7 +238,7 @@
  		if r.TLS.ServerName != "127.0.0.1" {
  			t.Errorf("expected client to set ServerName 127.0.0.1, got: %q", r.TLS.ServerName)
  		}
-@@ -652,33 +612,6 @@
+@@ -654,33 +614,6 @@
  	}
  }
  
@@ -272,7 +272,7 @@
  // Test for golang.org/issue/5829; the Transport should respect TLSClientConfig.ServerName
  // when not empty.
  //
-@@ -690,7 +623,7 @@
+@@ -692,7 +625,7 @@
  // The httptest.Server has a cert with "example.com" as its name.
  func TestTransportUsesTLSConfigServerName(t *testing.T) {
  	defer afterTest(t)
@@ -281,7 +281,7 @@
  		w.Write([]byte("Hello"))
  	}))
  	defer ts.Close()
-@@ -711,7 +644,7 @@
+@@ -713,7 +646,7 @@
  
  func TestResponseSetsTLSConnectionState(t *testing.T) {
  	defer afterTest(t)
@@ -290,7 +290,7 @@
  		w.Write([]byte("Hello"))
  	}))
  	defer ts.Close()
-@@ -739,7 +672,7 @@
+@@ -741,7 +674,7 @@
  // Verify Response.ContentLength is populated. http://golang.org/issue/4126
  func TestClientHeadContentLength(t *testing.T) {
  	defer afterTest(t)
@@ -299,7 +299,7 @@
  		if v := r.FormValue("cl"); v != "" {
  			w.Header().Set("Content-Length", v)
  		}
-@@ -775,7 +708,7 @@
+@@ -777,7 +710,7 @@
  func TestEmptyPasswordAuth(t *testing.T) {
  	defer afterTest(t)
  	gopher := "gopher"
@@ -308,7 +308,7 @@
  		auth := r.Header.Get("Authorization")
  		if strings.HasPrefix(auth, "Basic ") {
  			encoded := auth[6:]
-@@ -847,15 +780,15 @@
+@@ -849,15 +782,15 @@
  	defer afterTest(t)
  	sawRoot := make(chan bool, 1)
  	sawSlow := make(chan bool, 1)
@@ -327,7 +327,7 @@
  			sawSlow <- true
  			time.Sleep(2 * time.Second)
  			return
-@@ -908,10 +841,10 @@
+@@ -910,10 +843,10 @@
  func TestClientRedirectEatsBody(t *testing.T) {
  	defer afterTest(t)
  	saw := make(chan string, 2)
@@ -340,233 +340,50 @@
  		}
  	}))
  	defer ts.Close()
-
-=== modified file 'http13client/cookie_test.go'
---- http13client/cookie_test.go	2014-03-19 20:20:19 +0000
-+++ http13client/cookie_test.go	2014-03-19 22:27:37 +0000
-@@ -9,6 +9,7 @@
- 	"encoding/json"
- 	"fmt"
- 	"log"
-+	"net/http"
- 	"os"
- 	"reflect"
- 	"strings"
-@@ -17,39 +18,39 @@
- )
- 
- var writeSetCookiesTests = []struct {
--	Cookie *Cookie
-+	Cookie *http.Cookie
- 	Raw    string
- }{
- 	{
--		&Cookie{Name: "cookie-1", Value: "v$1"},
-+		&http.Cookie{Name: "cookie-1", Value: "v$1"},
- 		"cookie-1=v$1",
- 	},
- 	{
--		&Cookie{Name: "cookie-2", Value: "two", MaxAge: 3600},
-+		&http.Cookie{Name: "cookie-2", Value: "two", MaxAge: 3600},
- 		"cookie-2=two; Max-Age=3600",
- 	},
- 	{
--		&Cookie{Name: "cookie-3", Value: "three", Domain: ".example.com"},
-+		&http.Cookie{Name: "cookie-3", Value: "three", Domain: ".example.com"},
- 		"cookie-3=three; Domain=example.com",
- 	},
- 	{
--		&Cookie{Name: "cookie-4", Value: "four", Path: "/restricted/"},
-+		&http.Cookie{Name: "cookie-4", Value: "four", Path: "/restricted/"},
- 		"cookie-4=four; Path=/restricted/",
- 	},
- 	{
--		&Cookie{Name: "cookie-5", Value: "five", Domain: "wrong;bad.abc"},
-+		&http.Cookie{Name: "cookie-5", Value: "five", Domain: "wrong;bad.abc"},
- 		"cookie-5=five",
- 	},
- 	{
--		&Cookie{Name: "cookie-6", Value: "six", Domain: "bad-.abc"},
-+		&http.Cookie{Name: "cookie-6", Value: "six", Domain: "bad-.abc"},
- 		"cookie-6=six",
- 	},
- 	{
--		&Cookie{Name: "cookie-7", Value: "seven", Domain: "127.0.0.1"},
-+		&http.Cookie{Name: "cookie-7", Value: "seven", Domain: "127.0.0.1"},
- 		"cookie-7=seven; Domain=127.0.0.1",
- 	},
- 	{
--		&Cookie{Name: "cookie-8", Value: "eight", Domain: "::1"},
-+		&http.Cookie{Name: "cookie-8", Value: "eight", Domain: "::1"},
- 		"cookie-8=eight",
- 	},
- }
-@@ -71,10 +72,10 @@
- 	}
- }
- 
--type headerOnlyResponseWriter Header
-+type headerOnlyResponseWriter http.Header
- 
--func (ho headerOnlyResponseWriter) Header() Header {
--	return Header(ho)
-+func (ho headerOnlyResponseWriter) Header() http.Header {
-+	return http.Header(ho)
- }
- 
- func (ho headerOnlyResponseWriter) Write([]byte) (int, error) {
-@@ -86,9 +87,9 @@
- }
- 
- func TestSetCookie(t *testing.T) {
--	m := make(Header)
--	SetCookie(headerOnlyResponseWriter(m), &Cookie{Name: "cookie-1", Value: "one", Path: "/restricted/"})
--	SetCookie(headerOnlyResponseWriter(m), &Cookie{Name: "cookie-2", Value: "two", MaxAge: 3600})
-+	m := make(http.Header)
-+	http.SetCookie(headerOnlyResponseWriter(m), &http.Cookie{Name: "cookie-1", Value: "one", Path: "/restricted/"})
-+	http.SetCookie(headerOnlyResponseWriter(m), &http.Cookie{Name: "cookie-2", Value: "two", MaxAge: 3600})
- 	if l := len(m["Set-Cookie"]); l != 2 {
- 		t.Fatalf("expected %d cookies, got %d", 2, l)
- 	}
-@@ -101,19 +102,19 @@
- }
- 
- var addCookieTests = []struct {
--	Cookies []*Cookie
-+	Cookies []*http.Cookie
- 	Raw     string
- }{
- 	{
--		[]*Cookie{},
-+		[]*http.Cookie{},
- 		"",
- 	},
- 	{
--		[]*Cookie{{Name: "cookie-1", Value: "v$1"}},
-+		[]*http.Cookie{{Name: "cookie-1", Value: "v$1"}},
- 		"cookie-1=v$1",
- 	},
- 	{
--		[]*Cookie{
-+		[]*http.Cookie{
- 			{Name: "cookie-1", Value: "v$1"},
- 			{Name: "cookie-2", Value: "v$2"},
- 			{Name: "cookie-3", Value: "v$3"},
-@@ -136,16 +137,16 @@
- }
- 
- var readSetCookiesTests = []struct {
--	Header  Header
--	Cookies []*Cookie
-+	Header  http.Header
-+	Cookies []*http.Cookie
- }{
- 	{
--		Header{"Set-Cookie": {"Cookie-1=v$1"}},
--		[]*Cookie{{Name: "Cookie-1", Value: "v$1", Raw: "Cookie-1=v$1"}},
-+		http.Header{"Set-Cookie": {"Cookie-1=v$1"}},
-+		[]*http.Cookie{{Name: "Cookie-1", Value: "v$1", Raw: "Cookie-1=v$1"}},
- 	},
- 	{
--		Header{"Set-Cookie": {"NID=99=YsDT5i3E-CXax-; expires=Wed, 23-Nov-2011 01:05:03 GMT; path=/; domain=.google.ch; HttpOnly"}},
--		[]*Cookie{{
-+		http.Header{"Set-Cookie": {"NID=99=YsDT5i3E-CXax-; expires=Wed, 23-Nov-2011 01:05:03 GMT; path=/; domain=.google.ch; HttpOnly"}},
-+		[]*http.Cookie{{
- 			Name:       "NID",
- 			Value:      "99=YsDT5i3E-CXax-",
- 			Path:       "/",
-@@ -157,8 +158,8 @@
- 		}},
- 	},
- 	{
--		Header{"Set-Cookie": {".ASPXAUTH=7E3AA; expires=Wed, 07-Mar-2012 14:25:06 GMT; path=/; HttpOnly"}},
--		[]*Cookie{{
-+		http.Header{"Set-Cookie": {".ASPXAUTH=7E3AA; expires=Wed, 07-Mar-2012 14:25:06 GMT; path=/; HttpOnly"}},
-+		[]*http.Cookie{{
- 			Name:       ".ASPXAUTH",
- 			Value:      "7E3AA",
- 			Path:       "/",
-@@ -169,8 +170,8 @@
- 		}},
- 	},
- 	{
--		Header{"Set-Cookie": {"ASP.NET_SessionId=foo; path=/; HttpOnly"}},
--		[]*Cookie{{
-+		http.Header{"Set-Cookie": {"ASP.NET_SessionId=foo; path=/; HttpOnly"}},
-+		[]*http.Cookie{{
- 			Name:     "ASP.NET_SessionId",
- 			Value:    "foo",
- 			Path:     "/",
-@@ -207,37 +208,37 @@
- }
- 
- var readCookiesTests = []struct {
--	Header  Header
-+	Header  http.Header
- 	Filter  string
--	Cookies []*Cookie
-+	Cookies []*http.Cookie
- }{
- 	{
--		Header{"Cookie": {"Cookie-1=v$1", "c2=v2"}},
--		"",
--		[]*Cookie{
--			{Name: "Cookie-1", Value: "v$1"},
--			{Name: "c2", Value: "v2"},
--		},
--	},
--	{
--		Header{"Cookie": {"Cookie-1=v$1", "c2=v2"}},
--		"c2",
--		[]*Cookie{
--			{Name: "c2", Value: "v2"},
--		},
--	},
--	{
--		Header{"Cookie": {"Cookie-1=v$1; c2=v2"}},
--		"",
--		[]*Cookie{
--			{Name: "Cookie-1", Value: "v$1"},
--			{Name: "c2", Value: "v2"},
--		},
--	},
--	{
--		Header{"Cookie": {"Cookie-1=v$1; c2=v2"}},
--		"c2",
--		[]*Cookie{
-+		http.Header{"Cookie": {"Cookie-1=v$1", "c2=v2"}},
-+		"",
-+		[]*http.Cookie{
-+			{Name: "Cookie-1", Value: "v$1"},
-+			{Name: "c2", Value: "v2"},
-+		},
-+	},
-+	{
-+		http.Header{"Cookie": {"Cookie-1=v$1", "c2=v2"}},
-+		"c2",
-+		[]*http.Cookie{
-+			{Name: "c2", Value: "v2"},
-+		},
-+	},
-+	{
-+		http.Header{"Cookie": {"Cookie-1=v$1; c2=v2"}},
-+		"",
-+		[]*http.Cookie{
-+			{Name: "Cookie-1", Value: "v$1"},
-+			{Name: "c2", Value: "v2"},
-+		},
-+	},
-+	{
-+		http.Header{"Cookie": {"Cookie-1=v$1; c2=v2"}},
-+		"c2",
-+		[]*http.Cookie{
- 			{Name: "c2", Value: "v2"},
- 		},
- 	},
+@@ -957,7 +890,7 @@
+ 
+ func TestClientTrailers(t *testing.T) {
+ 	defer afterTest(t)
+-	ts := httptest.NewServer(HandlerFunc(func(w ResponseWriter, r *Request) {
++	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ 		w.Header().Set("Connection", "close")
+ 		w.Header().Set("Trailer", "Server-Trailer-A, Server-Trailer-B")
+ 		w.Header().Add("Trailer", "Server-Trailer-C")
+@@ -992,9 +925,9 @@
+ 		// trailers to be sent, if and only if they were
+ 		// previously declared with w.Header().Set("Trailer",
+ 		// ..keys..)
+-		w.(Flusher).Flush()
+-		conn, buf, _ := w.(Hijacker).Hijack()
+-		t := Header{}
++		w.(http.Flusher).Flush()
++		conn, buf, _ := w.(http.Hijacker).Hijack()
++		t := http.Header{}
+ 		t.Set("Server-Trailer-A", "valuea")
+ 		t.Set("Server-Trailer-C", "valuec") // skipping B
+ 		buf.WriteString("0\r\n")            // eof
+@@ -1015,7 +948,7 @@
+ 			req.Trailer["Client-Trailer-B"] = []string{"valueb"}
+ 		}),
+ 	))
+-	req.Trailer = Header{
++	req.Trailer = http.Header{
+ 		"Client-Trailer-A": nil, //  to be set later
+ 		"Client-Trailer-B": nil, //  to be set later
+ 	}
+@@ -1027,7 +960,7 @@
+ 	if err := wantBody(res, err, "decl: [Client-Trailer-A Client-Trailer-B], vals: valuea, valueb"); err != nil {
+ 		t.Error(err)
+ 	}
+-	want := Header{
++	want := http.Header{
+ 		"Server-Trailer-A": []string{"valuea"},
+ 		"Server-Trailer-B": nil,
+ 		"Server-Trailer-C": []string{"valuec"},
 
 === modified file 'http13client/export_test.go'
---- http13client/export_test.go	2014-03-19 20:20:19 +0000
-+++ http13client/export_test.go	2014-03-19 22:27:37 +0000
+--- http13client/export_test.go	2014-06-20 11:00:47 +0000
++++ http13client/export_test.go	2014-06-20 12:00:22 +0000
 @@ -9,15 +9,12 @@
  
  import (
@@ -599,8 +416,8 @@
  	noProxyEnv.reset()
 
 === modified file 'http13client/header_test.go'
---- http13client/header_test.go	2014-03-19 20:20:19 +0000
-+++ http13client/header_test.go	2014-03-19 22:27:37 +0000
+--- http13client/header_test.go	2014-06-20 11:00:47 +0000
++++ http13client/header_test.go	2014-06-20 12:00:22 +0000
 @@ -6,19 +6,20 @@
  
  import (
@@ -731,8 +548,8 @@
  	}
 
 === modified file 'http13client/npn_test.go'
---- http13client/npn_test.go	2014-03-19 21:38:56 +0000
-+++ http13client/npn_test.go	2014-03-19 22:27:37 +0000
+--- http13client/npn_test.go	2014-06-20 11:00:47 +0000
++++ http13client/npn_test.go	2014-06-20 12:05:53 +0000
 @@ -11,13 +11,14 @@
  	"io"
  	"io/ioutil"
@@ -792,8 +609,8 @@
  func (w http09Writer) WriteHeader(int) {} // no headers
 
 === modified file 'http13client/readrequest_test.go'
---- http13client/readrequest_test.go	2014-03-19 20:20:19 +0000
-+++ http13client/readrequest_test.go	2014-03-19 22:27:37 +0000
+--- http13client/readrequest_test.go	2014-06-20 11:00:47 +0000
++++ http13client/readrequest_test.go	2014-06-20 12:00:22 +0000
 @@ -9,6 +9,7 @@
  	"bytes"
  	"fmt"
@@ -909,8 +726,8 @@
  			Close:         false,
 
 === modified file 'http13client/request_test.go'
---- http13client/request_test.go	2014-03-19 21:38:56 +0000
-+++ http13client/request_test.go	2014-03-19 22:27:37 +0000
+--- http13client/request_test.go	2014-06-20 11:00:47 +0000
++++ http13client/request_test.go	2014-06-20 12:05:53 +0000
 @@ -12,6 +12,7 @@
  	"io/ioutil"
  	"mime/multipart"
@@ -945,8 +762,26 @@
 +	req.Header = http.Header{"Content-Type": {"text/plain"}}
  	multipart, err = req.MultipartReader()
  	if multipart != nil {
- 		t.Errorf("unexpected multipart for text/plain")
-@@ -159,7 +160,7 @@
+ 		t.Error("unexpected multipart for text/plain")
+@@ -161,7 +162,7 @@
+ func TestParseMultipartForm(t *testing.T) {
+ 	req := &Request{
+ 		Method: "POST",
+-		Header: Header{"Content-Type": {`multipart/form-data; boundary="foo123"`}},
++		Header: http.Header{"Content-Type": {`multipart/form-data; boundary="foo123"`}},
+ 		Body:   ioutil.NopCloser(new(bytes.Buffer)),
+ 	}
+ 	err := req.ParseMultipartForm(25)
+@@ -169,7 +170,7 @@
+ 		t.Error("expected multipart EOF, got nil")
+ 	}
+ 
+-	req.Header = Header{"Content-Type": {"text/plain"}}
++	req.Header = http.Header{"Content-Type": {"text/plain"}}
+ 	err = req.ParseMultipartForm(25)
+ 	if err != ErrNotMultipart {
+ 		t.Error("expected ErrNotMultipart for text/plain")
+@@ -177,7 +178,7 @@
  }
  
  func TestRedirect(t *testing.T) {
@@ -957,8 +792,8 @@
  			w.Header().Set("Location", "/foo/")
 
 === modified file 'http13client/requestwrite_test.go'
---- http13client/requestwrite_test.go	2014-03-19 20:20:19 +0000
-+++ http13client/requestwrite_test.go	2014-03-19 22:27:37 +0000
+--- http13client/requestwrite_test.go	2014-06-20 11:00:47 +0000
++++ http13client/requestwrite_test.go	2014-06-20 12:00:22 +0000
 @@ -10,6 +10,7 @@
  	"fmt"
  	"io"
@@ -1068,8 +903,8 @@
  		var braw bytes.Buffer
 
 === modified file 'http13client/response_test.go'
---- http13client/response_test.go	2014-03-19 20:20:19 +0000
-+++ http13client/response_test.go	2014-03-19 22:27:37 +0000
+--- http13client/response_test.go	2014-06-20 11:00:47 +0000
++++ http13client/response_test.go	2014-06-20 12:05:53 +0000
 @@ -12,6 +12,7 @@
  	"fmt"
  	"io"
@@ -1078,7 +913,7 @@
  	"net/url"
  	"reflect"
  	"regexp"
-@@ -44,7 +45,7 @@
+@@ -48,7 +49,7 @@
  			ProtoMajor: 1,
  			ProtoMinor: 0,
  			Request:    dummyReq("GET"),
@@ -1087,7 +922,7 @@
  				"Connection": {"close"}, // TODO(rsc): Delete?
  			},
  			Close:         true,
-@@ -67,7 +68,7 @@
+@@ -71,7 +72,7 @@
  			Proto:         "HTTP/1.1",
  			ProtoMajor:    1,
  			ProtoMinor:    1,
@@ -1096,7 +931,7 @@
  			Request:       dummyReq("GET"),
  			Close:         true,
  			ContentLength: -1,
-@@ -88,7 +89,7 @@
+@@ -92,7 +93,7 @@
  			Proto:         "HTTP/1.1",
  			ProtoMajor:    1,
  			ProtoMinor:    1,
@@ -1105,7 +940,7 @@
  			Request:       dummyReq("GET"),
  			Close:         false,
  			ContentLength: 0,
-@@ -112,7 +113,7 @@
+@@ -116,7 +117,7 @@
  			ProtoMajor: 1,
  			ProtoMinor: 0,
  			Request:    dummyReq("GET"),
@@ -1114,61 +949,61 @@
  				"Connection":     {"close"},
  				"Content-Length": {"10"},
  			},
-@@ -142,7 +143,7 @@
- 			ProtoMajor:       1,
- 			ProtoMinor:       1,
- 			Request:          dummyReq("GET"),
--			Header:           Header{},
-+			Header:           http.Header{},
- 			Close:            false,
- 			ContentLength:    -1,
- 			TransferEncoding: []string{"chunked"},
-@@ -169,7 +170,7 @@
- 			ProtoMajor:       1,
- 			ProtoMinor:       1,
- 			Request:          dummyReq("GET"),
--			Header:           Header{},
-+			Header:           http.Header{},
- 			Close:            false,
- 			ContentLength:    -1,
- 			TransferEncoding: []string{"chunked"},
-@@ -191,7 +192,7 @@
- 			ProtoMajor:       1,
- 			ProtoMinor:       1,
- 			Request:          dummyReq("HEAD"),
--			Header:           Header{},
-+			Header:           http.Header{},
- 			TransferEncoding: []string{"chunked"},
- 			Close:            false,
- 			ContentLength:    -1,
-@@ -213,7 +214,7 @@
- 			ProtoMajor:       1,
- 			ProtoMinor:       0,
- 			Request:          dummyReq("HEAD"),
--			Header:           Header{"Content-Length": {"256"}},
-+			Header:           http.Header{"Content-Length": {"256"}},
- 			TransferEncoding: nil,
- 			Close:            true,
- 			ContentLength:    256,
-@@ -235,7 +236,7 @@
- 			ProtoMajor:       1,
- 			ProtoMinor:       1,
- 			Request:          dummyReq("HEAD"),
--			Header:           Header{"Content-Length": {"256"}},
-+			Header:           http.Header{"Content-Length": {"256"}},
- 			TransferEncoding: nil,
- 			Close:            false,
- 			ContentLength:    256,
-@@ -256,7 +257,7 @@
- 			ProtoMajor:       1,
- 			ProtoMinor:       0,
- 			Request:          dummyReq("HEAD"),
--			Header:           Header{},
-+			Header:           http.Header{},
- 			TransferEncoding: nil,
- 			Close:            true,
- 			ContentLength:    -1,
-@@ -278,7 +279,7 @@
+@@ -146,7 +147,7 @@
+ 			ProtoMajor:       1,
+ 			ProtoMinor:       1,
+ 			Request:          dummyReq("GET"),
+-			Header:           Header{},
++			Header:           http.Header{},
+ 			Close:            false,
+ 			ContentLength:    -1,
+ 			TransferEncoding: []string{"chunked"},
+@@ -173,7 +174,7 @@
+ 			ProtoMajor:       1,
+ 			ProtoMinor:       1,
+ 			Request:          dummyReq("GET"),
+-			Header:           Header{},
++			Header:           http.Header{},
+ 			Close:            false,
+ 			ContentLength:    -1,
+ 			TransferEncoding: []string{"chunked"},
+@@ -195,7 +196,7 @@
+ 			ProtoMajor:       1,
+ 			ProtoMinor:       1,
+ 			Request:          dummyReq("HEAD"),
+-			Header:           Header{},
++			Header:           http.Header{},
+ 			TransferEncoding: []string{"chunked"},
+ 			Close:            false,
+ 			ContentLength:    -1,
+@@ -217,7 +218,7 @@
+ 			ProtoMajor:       1,
+ 			ProtoMinor:       0,
+ 			Request:          dummyReq("HEAD"),
+-			Header:           Header{"Content-Length": {"256"}},
++			Header:           http.Header{"Content-Length": {"256"}},
+ 			TransferEncoding: nil,
+ 			Close:            true,
+ 			ContentLength:    256,
+@@ -239,7 +240,7 @@
+ 			ProtoMajor:       1,
+ 			ProtoMinor:       1,
+ 			Request:          dummyReq("HEAD"),
+-			Header:           Header{"Content-Length": {"256"}},
++			Header:           http.Header{"Content-Length": {"256"}},
+ 			TransferEncoding: nil,
+ 			Close:            false,
+ 			ContentLength:    256,
+@@ -260,7 +261,7 @@
+ 			ProtoMajor:       1,
+ 			ProtoMinor:       0,
+ 			Request:          dummyReq("HEAD"),
+-			Header:           Header{},
++			Header:           http.Header{},
+ 			TransferEncoding: nil,
+ 			Close:            true,
+ 			ContentLength:    -1,
+@@ -282,7 +283,7 @@
  			ProtoMajor: 1,
  			ProtoMinor: 1,
  			Request:    dummyReq("GET"),
@@ -1177,25 +1012,25 @@
  				"Content-Length": {"0"},
  			},
  			Close:         false,
-@@ -299,7 +300,7 @@
- 			ProtoMajor:    1,
- 			ProtoMinor:    0,
- 			Request:       dummyReq("GET"),
--			Header:        Header{},
-+			Header:        http.Header{},
- 			Close:         true,
- 			ContentLength: -1,
- 		},
-@@ -318,7 +319,7 @@
- 			ProtoMajor:    1,
- 			ProtoMinor:    0,
- 			Request:       dummyReq("GET"),
--			Header:        Header{},
-+			Header:        http.Header{},
- 			Close:         true,
- 			ContentLength: -1,
- 		},
-@@ -340,7 +341,7 @@
+@@ -303,7 +304,7 @@
+ 			ProtoMajor:    1,
+ 			ProtoMinor:    0,
+ 			Request:       dummyReq("GET"),
+-			Header:        Header{},
++			Header:        http.Header{},
+ 			Close:         true,
+ 			ContentLength: -1,
+ 		},
+@@ -322,7 +323,7 @@
+ 			ProtoMajor:    1,
+ 			ProtoMinor:    0,
+ 			Request:       dummyReq("GET"),
+-			Header:        Header{},
++			Header:        http.Header{},
+ 			Close:         true,
+ 			ContentLength: -1,
+ 		},
+@@ -344,7 +345,7 @@
  			ProtoMajor: 1,
  			ProtoMinor: 1,
  			Request:    dummyReq("GET"),
@@ -1204,7 +1039,7 @@
  				"Content-Type": []string{"multipart/byteranges; boundary=18a75608c8f47cef"},
  			},
  			Close:         true,
-@@ -363,7 +364,7 @@
+@@ -367,7 +368,7 @@
  			Proto:      "HTTP/1.0",
  			ProtoMajor: 1,
  			ProtoMinor: 0,
@@ -1213,7 +1048,7 @@
  				"Connection": {"close"}, // TODO(rsc): Delete?
  			},
  			Close:         true,
-@@ -545,7 +546,7 @@
+@@ -549,7 +550,7 @@
  func TestLocationResponse(t *testing.T) {
  	for i, tt := range responseLocationTests {
  		res := new(Response)
@@ -1222,7 +1057,7 @@
  		res.Header.Set("Location", tt.location)
  		if tt.requrl != "" {
  			res.Request = &Request{}
-@@ -626,16 +627,3 @@
+@@ -630,16 +631,3 @@
  		t.Errorf("ReadResponse = %v; want io.ErrUnexpectedEOF", err)
  	}
  }
@@ -1241,8 +1076,8 @@
 -}
 
 === modified file 'http13client/responsewrite_test.go'
---- http13client/responsewrite_test.go	2014-03-19 20:20:19 +0000
-+++ http13client/responsewrite_test.go	2014-03-19 22:27:37 +0000
+--- http13client/responsewrite_test.go	2014-06-20 11:00:47 +0000
++++ http13client/responsewrite_test.go	2014-06-20 12:05:53 +0000
 @@ -7,6 +7,7 @@
  import (
  	"bytes"
@@ -1257,7 +1092,7 @@
  				Request:       dummyReq("GET"),
 -				Header:        Header{},
 +				Header:        http.Header{},
- 				Body:          ioutil.NopCloser(bytes.NewBufferString("abcdef")),
+ 				Body:          ioutil.NopCloser(strings.NewReader("abcdef")),
  				ContentLength: 6,
  			},
 @@ -41,7 +42,7 @@
@@ -1270,6 +1105,60 @@
  				ContentLength: -1,
  			},
 @@ -56,7 +57,7 @@
+ 				ProtoMajor:    1,
+ 				ProtoMinor:    1,
+ 				Request:       dummyReq("GET"),
+-				Header:        Header{},
++				Header:        http.Header{},
+ 				Body:          ioutil.NopCloser(strings.NewReader("abcdef")),
+ 				ContentLength: -1,
+ 				Close:         true,
+@@ -73,7 +74,7 @@
+ 				ProtoMajor:    1,
+ 				ProtoMinor:    1,
+ 				Request:       dummyReq11("GET"),
+-				Header:        Header{},
++				Header:        http.Header{},
+ 				Body:          ioutil.NopCloser(strings.NewReader("abcdef")),
+ 				ContentLength: -1,
+ 				Close:         false,
+@@ -91,7 +92,7 @@
+ 				ProtoMajor:       1,
+ 				ProtoMinor:       1,
+ 				Request:          dummyReq11("GET"),
+-				Header:           Header{},
++				Header:           http.Header{},
+ 				Body:             ioutil.NopCloser(strings.NewReader("abcdef")),
+ 				ContentLength:    -1,
+ 				TransferEncoding: []string{"chunked"},
+@@ -108,7 +109,7 @@
+ 				ProtoMajor:    1,
+ 				ProtoMinor:    1,
+ 				Request:       dummyReq11("GET"),
+-				Header:        Header{},
++				Header:        http.Header{},
+ 				Body:          nil,
+ 				ContentLength: 0,
+ 				Close:         false,
+@@ -124,7 +125,7 @@
+ 				ProtoMajor:    1,
+ 				ProtoMinor:    1,
+ 				Request:       dummyReq11("GET"),
+-				Header:        Header{},
++				Header:        http.Header{},
+ 				Body:          ioutil.NopCloser(strings.NewReader("")),
+ 				ContentLength: 0,
+ 				Close:         false,
+@@ -140,7 +141,7 @@
+ 				ProtoMajor:    1,
+ 				ProtoMinor:    1,
+ 				Request:       dummyReq11("GET"),
+-				Header:        Header{},
++				Header:        http.Header{},
+ 				Body:          ioutil.NopCloser(strings.NewReader("foo")),
+ 				ContentLength: 0,
+ 				Close:         false,
+@@ -156,7 +157,7 @@
  				ProtoMajor:       1,
  				ProtoMinor:       1,
  				Request:          dummyReq("GET"),
@@ -1278,7 +1167,7 @@
  				Body:             ioutil.NopCloser(strings.NewReader("abcdef")),
  				ContentLength:    6,
  				TransferEncoding: []string{"chunked"},
-@@ -77,7 +78,7 @@
+@@ -177,7 +178,7 @@
  				ProtoMajor: 1,
  				ProtoMinor: 1,
  				Request:    dummyReq("GET"),
@@ -1287,11 +1176,20 @@
  					"Foo": []string{" Bar\nBaz "},
  				},
  				Body:             nil,
+@@ -200,7 +201,7 @@
+ 				ProtoMajor:       1,
+ 				ProtoMinor:       1,
+ 				Request:          &Request{Method: "POST"},
+-				Header:           Header{},
++				Header:           http.Header{},
+ 				ContentLength:    0,
+ 				TransferEncoding: nil,
+ 				Body:             nil,
 
 === modified file 'http13client/transport_test.go'
---- http13client/transport_test.go	2014-03-19 21:38:56 +0000
-+++ http13client/transport_test.go	2014-03-19 22:27:37 +0000
-@@ -17,8 +17,8 @@
+--- http13client/transport_test.go	2014-06-20 11:00:47 +0000
++++ http13client/transport_test.go	2014-06-20 12:05:53 +0000
+@@ -18,8 +18,8 @@
  	"io/ioutil"
  	"log"
  	"net"
@@ -1301,7 +1199,7 @@
  	"net/http/httptest"
  	"net/url"
  	"os"
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
  //       and then verify that the final 2 responses get errors back.
  
  // hostPortHandler writes back the client's "host:port".
@@ -1310,7 +1208,7 @@
  	if r.FormValue("close") == "true" {
  		w.Header().Set("Connection", "close")
  	}
-@@ -280,7 +280,7 @@
+@@ -289,7 +289,7 @@
  	const msg = "foobar"
  
  	var addrSeen map[string]int
@@ -1319,7 +1217,7 @@
  		addrSeen[r.RemoteAddr]++
  		if r.URL.Path == "/chunked/" {
  			w.WriteHeader(200)
-@@ -299,7 +299,7 @@
+@@ -308,7 +308,7 @@
  		wantLen := []int{len(msg), -1}[pi]
  		addrSeen = make(map[string]int)
  		for i := 0; i < 3; i++ {
@@ -1328,7 +1226,7 @@
  			if err != nil {
  				t.Errorf("Get %s: %v", path, err)
  				continue
-@@ -329,7 +329,7 @@
+@@ -338,7 +338,7 @@
  	defer afterTest(t)
  	resch := make(chan string)
  	gotReq := make(chan bool)
@@ -1337,7 +1235,7 @@
  		gotReq <- true
  		msg := <-resch
  		_, err := w.Write([]byte(msg))
-@@ -457,12 +457,12 @@
+@@ -466,12 +466,12 @@
  	if testing.Short() {
  		t.Skip("skipping test in short mode")
  	}
@@ -1353,7 +1251,7 @@
  		buf.Flush()
  		conn.Close()
  	}))
-@@ -510,7 +510,7 @@
+@@ -519,7 +519,7 @@
  // with no bodies properly
  func TestTransportHeadResponses(t *testing.T) {
  	defer afterTest(t)
@@ -1362,7 +1260,7 @@
  		if r.Method != "HEAD" {
  			panic("expected HEAD; got " + r.Method)
  		}
-@@ -545,7 +545,7 @@
+@@ -554,7 +554,7 @@
  // on responses to HEAD requests.
  func TestTransportHeadChunkedResponse(t *testing.T) {
  	defer afterTest(t)
@@ -1371,7 +1269,7 @@
  		if r.Method != "HEAD" {
  			panic("expected HEAD; got " + r.Method)
  		}
-@@ -588,7 +588,7 @@
+@@ -597,7 +597,7 @@
  func TestRoundTripGzip(t *testing.T) {
  	defer afterTest(t)
  	const responseBody = "test response body"
@@ -1380,7 +1278,7 @@
  		accept := req.Header.Get("Accept-Encoding")
  		if expect := req.FormValue("expect_accept"); accept != expect {
  			t.Errorf("in handler, test %v: Accept-Encoding = %q, want %q",
-@@ -647,7 +647,7 @@
+@@ -656,7 +656,7 @@
  	defer afterTest(t)
  	const testString = "The test string aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
  	const nRandBytes = 1024 * 1024
@@ -1389,7 +1287,7 @@
  		if req.Method == "HEAD" {
  			if g := req.Header.Get("Accept-Encoding"); g != "" {
  				t.Errorf("HEAD request sent with Accept-Encoding of %q; want none", g)
-@@ -742,11 +742,11 @@
+@@ -751,11 +751,11 @@
  func TestTransportProxy(t *testing.T) {
  	defer afterTest(t)
  	ch := make(chan string, 1)
@@ -1403,7 +1301,7 @@
  		ch <- "proxy for " + r.URL.String()
  	}))
  	defer proxy.Close()
-@@ -770,7 +770,7 @@
+@@ -779,7 +779,7 @@
  // Content-Encoding is removed.
  func TestTransportGzipRecursive(t *testing.T) {
  	defer afterTest(t)
@@ -1412,7 +1310,16 @@
  		w.Header().Set("Content-Encoding", "gzip")
  		w.Write(rgz)
  	}))
-@@ -802,7 +802,7 @@
+@@ -807,7 +807,7 @@
+ // a short gzip body
+ func TestTransportGzipShort(t *testing.T) {
+ 	defer afterTest(t)
+-	ts := httptest.NewServer(HandlerFunc(func(w ResponseWriter, r *Request) {
++	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ 		w.Header().Set("Content-Encoding", "gzip")
+ 		w.Write([]byte{0x1f, 0x8b})
+ 	}))
+@@ -838,7 +838,7 @@
  	defer afterTest(t)
  	gotReqCh := make(chan bool)
  	unblockCh := make(chan bool)
@@ -1421,7 +1328,7 @@
  		gotReqCh <- true
  		<-unblockCh
  		w.Header().Set("Content-Length", "0")
-@@ -869,7 +869,7 @@
+@@ -905,7 +905,7 @@
  		t.Skip("skipping test; see http://golang.org/issue/7237")
  	}
  	defer afterTest(t)
@@ -1430,7 +1337,7 @@
  	}))
  	defer ts.Close()
  
-@@ -912,7 +912,7 @@
+@@ -948,7 +948,7 @@
  	c := &Client{Transport: tr}
  
  	unblockCh := make(chan bool, 1)
@@ -1439,7 +1346,7 @@
  		<-unblockCh
  		tr.CloseIdleConnections()
  	}))
-@@ -939,7 +939,7 @@
+@@ -975,7 +975,7 @@
  func TestIssue3644(t *testing.T) {
  	defer afterTest(t)
  	const numFoos = 5000
@@ -1448,7 +1355,7 @@
  		w.Header().Set("Connection", "close")
  		for i := 0; i < numFoos; i++ {
  			w.Write([]byte("foo "))
-@@ -967,8 +967,8 @@
+@@ -1003,8 +1003,8 @@
  func TestIssue3595(t *testing.T) {
  	defer afterTest(t)
  	const deniedMsg = "sorry, denied."
@@ -1459,7 +1366,7 @@
  	}))
  	defer ts.Close()
  	tr := &Transport{}
-@@ -991,7 +991,7 @@
+@@ -1027,7 +1027,7 @@
  // "client fails to handle requests with no body and chunked encoding"
  func TestChunkedNoContent(t *testing.T) {
  	defer afterTest(t)
@@ -1468,7 +1375,7 @@
  		w.WriteHeader(StatusNoContent)
  	}))
  	defer ts.Close()
-@@ -1019,7 +1019,7 @@
+@@ -1055,7 +1055,7 @@
  		maxProcs, numReqs = 4, 50
  	}
  	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(maxProcs))
@@ -1477,7 +1384,7 @@
  		fmt.Fprintf(w, "%v", r.FormValue("echo"))
  	}))
  	defer ts.Close()
-@@ -1080,8 +1080,8 @@
+@@ -1116,8 +1116,8 @@
  	}
  	defer afterTest(t)
  	const debug = false
@@ -1488,7 +1395,7 @@
  		io.Copy(w, neverEnding('a'))
  	})
  	ts := httptest.NewServer(mux)
-@@ -1144,11 +1144,11 @@
+@@ -1180,11 +1180,11 @@
  	}
  	defer afterTest(t)
  	const debug = false
@@ -1503,20 +1410,22 @@
  		defer r.Body.Close()
  		io.Copy(ioutil.Discard, r.Body)
  	})
-@@ -1214,9 +1214,9 @@
- 	if testing.Short() {
+@@ -1251,11 +1251,11 @@
  		t.Skip("skipping timeout test in -short mode")
  	}
+ 	inHandler := make(chan bool, 1)
 -	mux := NewServeMux()
--	mux.HandleFunc("/fast", func(w ResponseWriter, r *Request) {})
+-	mux.HandleFunc("/fast", func(w ResponseWriter, r *Request) {
++	mux := http.NewServeMux()
++	mux.HandleFunc("/fast", func(w http.ResponseWriter, r *http.Request) {
+ 		inHandler <- true
+ 	})
 -	mux.HandleFunc("/slow", func(w ResponseWriter, r *Request) {
-+	mux := http.NewServeMux()
-+	mux.HandleFunc("/fast", func(w http.ResponseWriter, r *http.Request) {})
 +	mux.HandleFunc("/slow", func(w http.ResponseWriter, r *http.Request) {
+ 		inHandler <- true
  		time.Sleep(2 * time.Second)
  	})
- 	ts := httptest.NewServer(mux)
-@@ -1276,9 +1276,9 @@
+@@ -1322,9 +1322,9 @@
  		t.Skip("skipping test in -short mode")
  	}
  	unblockc := make(chan bool)
@@ -1528,7 +1437,7 @@
  		<-unblockc
  	}))
  	defer ts.Close()
-@@ -1386,14 +1386,14 @@
+@@ -1431,14 +1431,14 @@
  	defer afterTest(t)
  	writeErr := make(chan error, 1)
  	msg := []byte("young\n")
@@ -1545,7 +1454,7 @@
  		}
  	}))
  	defer ts.Close()
-@@ -1449,7 +1449,7 @@
+@@ -1494,7 +1494,7 @@
  	res := &Response{
  		Status:     "200 OK",
  		StatusCode: 200,
@@ -1554,7 +1463,7 @@
  		Body:       ioutil.NopCloser(strings.NewReader("You wanted " + req.URL.String())),
  	}
  	return res, nil
-@@ -1478,7 +1478,7 @@
+@@ -1523,7 +1523,7 @@
  	defer afterTest(t)
  	tr := &Transport{}
  	_, err := tr.RoundTrip(&Request{
@@ -1563,7 +1472,7 @@
  		URL: &url.URL{
  			Scheme: "http",
  		},
-@@ -1492,14 +1492,14 @@
+@@ -1537,14 +1537,14 @@
  func TestTransportSocketLateBinding(t *testing.T) {
  	defer afterTest(t)
  
@@ -1582,7 +1491,7 @@
  		w.Header().Set("bar-ipport", r.RemoteAddr)
  	})
  	ts := httptest.NewServer(mux)
-@@ -1720,7 +1720,7 @@
+@@ -1767,7 +1767,7 @@
  	var mu sync.Mutex
  	var n int
  
@@ -1591,7 +1500,7 @@
  		mu.Lock()
  		n++
  		mu.Unlock()
-@@ -1756,7 +1756,7 @@
+@@ -1803,7 +1803,7 @@
  // then closes it.
  func TestTransportClosesRequestBody(t *testing.T) {
  	defer afterTest(t)
@@ -1600,4 +1509,49 @@
  		io.Copy(ioutil.Discard, r.Body)
  	}))
  	defer ts.Close()
+@@ -1890,9 +1890,9 @@
+ 		t.Skip("skipping flaky test on Windows; golang.org/issue/7634")
+ 	}
+ 	closedc := make(chan bool, 1)
+-	ts := httptest.NewTLSServer(HandlerFunc(func(w ResponseWriter, r *Request) {
++	ts := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ 		if strings.Contains(r.URL.Path, "/keep-alive-then-die") {
+-			conn, _, _ := w.(Hijacker).Hijack()
++			conn, _, _ := w.(http.Hijacker).Hijack()
+ 			conn.Write([]byte("HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nfoo"))
+ 			conn.Close()
+ 			closedc <- true
+@@ -1994,12 +1994,12 @@
+ 	}
+ 	defer closeConn()
+ 
+-	ts := httptest.NewServer(HandlerFunc(func(w ResponseWriter, r *Request) {
++	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ 		if r.Method == "GET" {
+ 			io.WriteString(w, "bar")
+ 			return
+ 		}
+-		conn, _, _ := w.(Hijacker).Hijack()
++		conn, _, _ := w.(http.Hijacker).Hijack()
+ 		sconn.Lock()
+ 		sconn.c = conn
+ 		sconn.Unlock()
+@@ -2056,7 +2056,7 @@
+ 	}
+ 	defer afterTest(t)
+ 	readBody := make(chan error, 1)
+-	ts := httptest.NewServer(HandlerFunc(func(w ResponseWriter, r *Request) {
++	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ 		_, err := ioutil.ReadAll(r.Body)
+ 		readBody <- err
+ 	}))
+@@ -2098,7 +2098,7 @@
+ 	}
+ }
+ 
+-func wantBody(res *http.Response, err error, want string) error {
++func wantBody(res *Response, err error, want string) error {
+ 	if err != nil {
+ 		return err
+ 	}
 
 
=== modified file 'http13client/_using.txt'
--- http13client/_using.txt	2014-03-20 12:20:01 +0000
+++ http13client/_using.txt	2014-06-20 13:24:39 +0000
@@ -1,5 +1,5 @@
-parent: 19512:32c32aef2a41 tip
- test: enable bug385_32 test on amd64p32.
-branch: default
+parent: 20169:9895f9e36435 go1.3 release
+ go1.3
+branch: release-branch.go1.3
 commit: (clean)
 update: (current)
 
=== modified file 'http13client/client.go'
--- http13client/client.go	2014-03-20 09:26:28 +0000
+++ http13client/client.go	2014-06-20 13:24:39 +0000
@@ -92,8 +92,9 @@
 	// authentication, or cookies.
 	//
 	// RoundTrip should not modify the request, except for
-	// consuming and closing the Body. The request's URL and
-	// Header fields are guaranteed to be initialized.
+	// consuming and closing the Body, including on errors. The
+	// request's URL and Header fields are guaranteed to be
+	// initialized.
 	RoundTrip(*Request) (*Response, error)
 }
 
@@ -141,6 +142,9 @@
 // (typically Transport) may not be able to re-use a persistent TCP
 // connection to the server for a subsequent "keep-alive" request.
 //
+// The request Body, if non-nil, will be closed by the underlying
+// Transport, even on errors.
+//
 // Generally Get, Post, or PostForm will be used instead of Do.
 func (c *Client) Do(req *Request) (resp *Response, err error) {
 	if req.Method == "GET" || req.Method == "HEAD" {
@@ -163,14 +167,17 @@
 // Caller should close resp.Body when done reading from it.
 func send(req *Request, t RoundTripper) (resp *Response, err error) {
 	if t == nil {
+		req.closeBody()
 		return nil, errors.New("http: no Client.Transport or DefaultTransport")
 	}
 
 	if req.URL == nil {
+		req.closeBody()
 		return nil, errors.New("http: nil Request.URL")
 	}
 
 	if req.RequestURI != "" {
+		req.closeBody()
 		return nil, errors.New("http: Request.RequestURI can't be set in client requests.")
 	}
 
@@ -278,6 +285,7 @@
 	var via []*Request
 
 	if ireq.URL == nil {
+		ireq.closeBody()
 		return nil, errors.New("http: nil Request.URL")
 	}
 
@@ -400,7 +408,7 @@
 // Caller should close resp.Body when done reading from it.
 //
 // If the provided body is also an io.Closer, it is closed after the
-// body is successfully written to the server.
+// request.
 func (c *Client) Post(url string, bodyType string, body io.Reader) (resp *Response, err error) {
 	req, err := NewRequest("POST", url, body)
 	if err != nil {
 
=== modified file 'http13client/client_test.go'
--- http13client/client_test.go	2014-03-20 09:26:28 +0000
+++ http13client/client_test.go	2014-06-20 13:24:39 +0000
@@ -20,6 +20,8 @@
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"reflect"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -877,3 +879,93 @@
 		t.Fatal("server saw different client ports before & after the redirect")
 	}
 }
+
+// eofReaderFunc is an io.Reader that runs itself, and then returns io.EOF.
+type eofReaderFunc func()
+
+func (f eofReaderFunc) Read(p []byte) (n int, err error) {
+	f()
+	return 0, io.EOF
+}
+
+func TestClientTrailers(t *testing.T) {
+	defer afterTest(t)
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Connection", "close")
+		w.Header().Set("Trailer", "Server-Trailer-A, Server-Trailer-B")
+		w.Header().Add("Trailer", "Server-Trailer-C")
+
+		var decl []string
+		for k := range r.Trailer {
+			decl = append(decl, k)
+		}
+		sort.Strings(decl)
+
+		slurp, err := ioutil.ReadAll(r.Body)
+		if err != nil {
+			t.Errorf("Server reading request body: %v", err)
+		}
+		if string(slurp) != "foo" {
+			t.Errorf("Server read request body %q; want foo", slurp)
+		}
+		if r.Trailer == nil {
+			io.WriteString(w, "nil Trailer")
+		} else {
+			fmt.Fprintf(w, "decl: %v, vals: %s, %s",
+				decl,
+				r.Trailer.Get("Client-Trailer-A"),
+				r.Trailer.Get("Client-Trailer-B"))
+		}
+
+		// TODO: golang.org/issue/7759: there's no way yet for
+		// the server to set trailers without hijacking, so do
+		// that for now, just to test the client.  Later, in
+		// Go 1.4, it should be implicit that any mutations
+		// to w.Header() after the initial write are the
+		// trailers to be sent, if and only if they were
+		// previously declared with w.Header().Set("Trailer",
+		// ..keys..)
+		w.(http.Flusher).Flush()
+		conn, buf, _ := w.(http.Hijacker).Hijack()
+		t := http.Header{}
+		t.Set("Server-Trailer-A", "valuea")
+		t.Set("Server-Trailer-C", "valuec") // skipping B
+		buf.WriteString("0\r\n")            // eof
+		t.Write(buf)
+		buf.WriteString("\r\n") // end of trailers
+		buf.Flush()
+		conn.Close()
+	}))
+	defer ts.Close()
+
+	var req *Request
+	req, _ = NewRequest("POST", ts.URL, io.MultiReader(
+		eofReaderFunc(func() {
+			req.Trailer["Client-Trailer-A"] = []string{"valuea"}
+		}),
+		strings.NewReader("foo"),
+		eofReaderFunc(func() {
+			req.Trailer["Client-Trailer-B"] = []string{"valueb"}
+		}),
+	))
+	req.Trailer = http.Header{
+		"Client-Trailer-A": nil, //  to be set later
+		"Client-Trailer-B": nil, //  to be set later
+	}
+	req.ContentLength = -1
+	res, err := DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := wantBody(res, err, "decl: [Client-Trailer-A Client-Trailer-B], vals: valuea, valueb"); err != nil {
+		t.Error(err)
+	}
+	want := http.Header{
+		"Server-Trailer-A": []string{"valuea"},
+		"Server-Trailer-B": nil,
+		"Server-Trailer-C": []string{"valuec"},
+	}
+	if !reflect.DeepEqual(res.Trailer, want) {
+		t.Errorf("Response trailers = %#v; want %#v", res.Trailer, want)
+	}
+}
 
=== modified file 'http13client/cookie.go'
--- http13client/cookie.go	2014-03-19 23:13:58 +0000
+++ http13client/cookie.go	2014-06-20 13:24:39 +0000
@@ -55,11 +55,7 @@
 				attr, val = attr[:j], attr[j+1:]
 			}
 			lowerAttr := strings.ToLower(attr)
-			parseCookieValueFn := parseCookieValue
-			if lowerAttr == "expires" {
-				parseCookieValueFn = parseCookieExpiresValue
-			}
-			val, success = parseCookieValueFn(val)
+			val, success = parseCookieValue(val)
 			if !success {
 				c.Unparsed = append(c.Unparsed, parts[i])
 				continue
@@ -230,12 +226,23 @@
 //           ; US-ASCII characters excluding CTLs,
 //           ; whitespace DQUOTE, comma, semicolon,
 //           ; and backslash
+// We loosen this as spaces and commas are common in cookie values
+// but we produce a quoted cookie-value in when value starts or ends
+// with a comma or space.
+// See http://golang.org/issue/7243 for the discussion.
 func sanitizeCookieValue(v string) string {
-	return sanitizeOrWarn("Cookie.Value", validCookieValueByte, v)
+	v = sanitizeOrWarn("Cookie.Value", validCookieValueByte, v)
+	if len(v) == 0 {
+		return v
+	}
+	if v[0] == ' ' || v[0] == ',' || v[len(v)-1] == ' ' || v[len(v)-1] == ',' {
+		return `"` + v + `"`
+	}
+	return v
 }
 
 func validCookieValueByte(b byte) bool {
-	return 0x20 < b && b < 0x7f && b != '"' && b != ',' && b != ';' && b != '\\'
+	return 0x20 <= b && b < 0x7f && b != '"' && b != ';' && b != '\\'
 }
 
 // path-av           = "Path=" path-value
@@ -270,38 +277,13 @@
 	return string(buf)
 }
 
-func unquoteCookieValue(v string) string {
-	if len(v) > 1 && v[0] == '"' && v[len(v)-1] == '"' {
-		return v[1 : len(v)-1]
-	}
-	return v
-}
-
-func isCookieByte(c byte) bool {
-	switch {
-	case c == 0x21, 0x23 <= c && c <= 0x2b, 0x2d <= c && c <= 0x3a,
-		0x3c <= c && c <= 0x5b, 0x5d <= c && c <= 0x7e:
-		return true
-	}
-	return false
-}
-
-func isCookieExpiresByte(c byte) (ok bool) {
-	return isCookieByte(c) || c == ',' || c == ' '
-}
-
 func parseCookieValue(raw string) (string, bool) {
-	return parseCookieValueUsing(raw, isCookieByte)
-}
-
-func parseCookieExpiresValue(raw string) (string, bool) {
-	return parseCookieValueUsing(raw, isCookieExpiresByte)
-}
-
-func parseCookieValueUsing(raw string, validByte func(byte) bool) (string, bool) {
-	raw = unquoteCookieValue(raw)
+	// Strip the quotes, if present.
+	if len(raw) > 1 && raw[0] == '"' && raw[len(raw)-1] == '"' {
+		raw = raw[1 : len(raw)-1]
+	}
 	for i := 0; i < len(raw); i++ {
-		if !validByte(raw[i]) {
+		if !validCookieValueByte(raw[i]) {
 			return "", false
 		}
 	}
 
=== removed file 'http13client/cookie_test.go'
--- http13client/cookie_test.go	2014-03-19 23:13:58 +0000
+++ http13client/cookie_test.go	1970-01-01 00:00:00 +0000
@@ -1,304 +0,0 @@
-// 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.
-
-package http
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-)
-
-var writeSetCookiesTests = []struct {
-	Cookie *http.Cookie
-	Raw    string
-}{
-	{
-		&http.Cookie{Name: "cookie-1", Value: "v$1"},
-		"cookie-1=v$1",
-	},
-	{
-		&http.Cookie{Name: "cookie-2", Value: "two", MaxAge: 3600},
-		"cookie-2=two; Max-Age=3600",
-	},
-	{
-		&http.Cookie{Name: "cookie-3", Value: "three", Domain: ".example.com"},
-		"cookie-3=three; Domain=example.com",
-	},
-	{
-		&http.Cookie{Name: "cookie-4", Value: "four", Path: "/restricted/"},
-		"cookie-4=four; Path=/restricted/",
-	},
-	{
-		&http.Cookie{Name: "cookie-5", Value: "five", Domain: "wrong;bad.abc"},
-		"cookie-5=five",
-	},
-	{
-		&http.Cookie{Name: "cookie-6", Value: "six", Domain: "bad-.abc"},
-		"cookie-6=six",
-	},
-	{
-		&http.Cookie{Name: "cookie-7", Value: "seven", Domain: "127.0.0.1"},
-		"cookie-7=seven; Domain=127.0.0.1",
-	},
-	{
-		&http.Cookie{Name: "cookie-8", Value: "eight", Domain: "::1"},
-		"cookie-8=eight",
-	},
-}
-
-func TestWriteSetCookies(t *testing.T) {
-	defer log.SetOutput(os.Stderr)
-	var logbuf bytes.Buffer
-	log.SetOutput(&logbuf)
-
-	for i, tt := range writeSetCookiesTests {
-		if g, e := tt.Cookie.String(), tt.Raw; g != e {
-			t.Errorf("Test %d, expecting:\n%s\nGot:\n%s\n", i, e, g)
-			continue
-		}
-	}
-
-	if got, sub := logbuf.String(), "dropping domain attribute"; !strings.Contains(got, sub) {
-		t.Errorf("Expected substring %q in log output. Got:\n%s", sub, got)
-	}
-}
-
-type headerOnlyResponseWriter http.Header
-
-func (ho headerOnlyResponseWriter) Header() http.Header {
-	return http.Header(ho)
-}
-
-func (ho headerOnlyResponseWriter) Write([]byte) (int, error) {
-	panic("NOIMPL")
-}
-
-func (ho headerOnlyResponseWriter) WriteHeader(int) {
-	panic("NOIMPL")
-}
-
-func TestSetCookie(t *testing.T) {
-	m := make(http.Header)
-	http.SetCookie(headerOnlyResponseWriter(m), &http.Cookie{Name: "cookie-1", Value: "one", Path: "/restricted/"})
-	http.SetCookie(headerOnlyResponseWriter(m), &http.Cookie{Name: "cookie-2", Value: "two", MaxAge: 3600})
-	if l := len(m["Set-Cookie"]); l != 2 {
-		t.Fatalf("expected %d cookies, got %d", 2, l)
-	}
-	if g, e := m["Set-Cookie"][0], "cookie-1=one; Path=/restricted/"; g != e {
-		t.Errorf("cookie #1: want %q, got %q", e, g)
-	}
-	if g, e := m["Set-Cookie"][1], "cookie-2=two; Max-Age=3600"; g != e {
-		t.Errorf("cookie #2: want %q, got %q", e, g)
-	}
-}
-
-var addCookieTests = []struct {
-	Cookies []*http.Cookie
-	Raw     string
-}{
-	{
-		[]*http.Cookie{},
-		"",
-	},
-	{
-		[]*http.Cookie{{Name: "cookie-1", Value: "v$1"}},
-		"cookie-1=v$1",
-	},
-	{
-		[]*http.Cookie{
-			{Name: "cookie-1", Value: "v$1"},
-			{Name: "cookie-2", Value: "v$2"},
-			{Name: "cookie-3", Value: "v$3"},
-		},
-		"cookie-1=v$1; cookie-2=v$2; cookie-3=v$3",
-	},
-}
-
-func TestAddCookie(t *testing.T) {
-	for i, tt := range addCookieTests {
-		req, _ := NewRequest("GET", "http://example.com/", nil)
-		for _, c := range tt.Cookies {
-			req.AddCookie(c)
-		}
-		if g := req.Header.Get("Cookie"); g != tt.Raw {
-			t.Errorf("Test %d:\nwant: %s\n got: %s\n", i, tt.Raw, g)
-			continue
-		}
-	}
-}
-
-var readSetCookiesTests = []struct {
-	Header  http.Header
-	Cookies []*http.Cookie
-}{
-	{
-		http.Header{"Set-Cookie": {"Cookie-1=v$1"}},
-		[]*http.Cookie{{Name: "Cookie-1", Value: "v$1", Raw: "Cookie-1=v$1"}},
-	},
-	{
-		http.Header{"Set-Cookie": {"NID=99=YsDT5i3E-CXax-; expires=Wed, 23-Nov-2011 01:05:03 GMT; path=/; domain=.google.ch; HttpOnly"}},
-		[]*http.Cookie{{
-			Name:       "NID",
-			Value:      "99=YsDT5i3E-CXax-",
-			Path:       "/",
-			Domain:     ".google.ch",
-			HttpOnly:   true,
-			Expires:    time.Date(2011, 11, 23, 1, 5, 3, 0, time.UTC),
-			RawExpires: "Wed, 23-Nov-2011 01:05:03 GMT",
-			Raw:        "NID=99=YsDT5i3E-CXax-; expires=Wed, 23-Nov-2011 01:05:03 GMT; path=/; domain=.google.ch; HttpOnly",
-		}},
-	},
-	{
-		http.Header{"Set-Cookie": {".ASPXAUTH=7E3AA; expires=Wed, 07-Mar-2012 14:25:06 GMT; path=/; HttpOnly"}},
-		[]*http.Cookie{{
-			Name:       ".ASPXAUTH",
-			Value:      "7E3AA",
-			Path:       "/",
-			Expires:    time.Date(2012, 3, 7, 14, 25, 6, 0, time.UTC),
-			RawExpires: "Wed, 07-Mar-2012 14:25:06 GMT",
-			HttpOnly:   true,
-			Raw:        ".ASPXAUTH=7E3AA; expires=Wed, 07-Mar-2012 14:25:06 GMT; path=/; HttpOnly",
-		}},
-	},
-	{
-		http.Header{"Set-Cookie": {"ASP.NET_SessionId=foo; path=/; HttpOnly"}},
-		[]*http.Cookie{{
-			Name:     "ASP.NET_SessionId",
-			Value:    "foo",
-			Path:     "/",
-			HttpOnly: true,
-			Raw:      "ASP.NET_SessionId=foo; path=/; HttpOnly",
-		}},
-	},
-
-	// TODO(bradfitz): users have reported seeing this in the
-	// wild, but do browsers handle it? RFC 6265 just says "don't
-	// do that" (section 3) and then never mentions header folding
-	// again.
-	// Header{"Set-Cookie": {"ASP.NET_SessionId=foo; path=/; HttpOnly, .ASPXAUTH=7E3AA; expires=Wed, 07-Mar-2012 14:25:06 GMT; path=/; HttpOnly"}},
-}
-
-func toJSON(v interface{}) string {
-	b, err := json.Marshal(v)
-	if err != nil {
-		return fmt.Sprintf("%#v", v)
-	}
-	return string(b)
-}
-
-func TestReadSetCookies(t *testing.T) {
-	for i, tt := range readSetCookiesTests {
-		for n := 0; n < 2; n++ { // to verify readSetCookies doesn't mutate its input
-			c := readSetCookies(tt.Header)
-			if !reflect.DeepEqual(c, tt.Cookies) {
-				t.Errorf("#%d readSetCookies: have\n%s\nwant\n%s\n", i, toJSON(c), toJSON(tt.Cookies))
-				continue
-			}
-		}
-	}
-}
-
-var readCookiesTests = []struct {
-	Header  http.Header
-	Filter  string
-	Cookies []*http.Cookie
-}{
-	{
-		http.Header{"Cookie": {"Cookie-1=v$1", "c2=v2"}},
-		"",
-		[]*http.Cookie{
-			{Name: "Cookie-1", Value: "v$1"},
-			{Name: "c2", Value: "v2"},
-		},
-	},
-	{
-		http.Header{"Cookie": {"Cookie-1=v$1", "c2=v2"}},
-		"c2",
-		[]*http.Cookie{
-			{Name: "c2", Value: "v2"},
-		},
-	},
-	{
-		http.Header{"Cookie": {"Cookie-1=v$1; c2=v2"}},
-		"",
-		[]*http.Cookie{
-			{Name: "Cookie-1", Value: "v$1"},
-			{Name: "c2", Value: "v2"},
-		},
-	},
-	{
-		http.Header{"Cookie": {"Cookie-1=v$1; c2=v2"}},
-		"c2",
-		[]*http.Cookie{
-			{Name: "c2", Value: "v2"},
-		},
-	},
-}
-
-func TestReadCookies(t *testing.T) {
-	for i, tt := range readCookiesTests {
-		for n := 0; n < 2; n++ { // to verify readCookies doesn't mutate its input
-			c := readCookies(tt.Header, tt.Filter)
-			if !reflect.DeepEqual(c, tt.Cookies) {
-				t.Errorf("#%d readCookies:\nhave: %s\nwant: %s\n", i, toJSON(c), toJSON(tt.Cookies))
-				continue
-			}
-		}
-	}
-}
-
-func TestCookieSanitizeValue(t *testing.T) {
-	defer log.SetOutput(os.Stderr)
-	var logbuf bytes.Buffer
-	log.SetOutput(&logbuf)
-
-	tests := []struct {
-		in, want string
-	}{
-		{"foo", "foo"},
-		{"foo bar", "foobar"},
-		{"\x00\x7e\x7f\x80", "\x7e"},
-		{`"withquotes"`, "withquotes"},
-	}
-	for _, tt := range tests {
-		if got := sanitizeCookieValue(tt.in); got != tt.want {
-			t.Errorf("sanitizeCookieValue(%q) = %q; want %q", tt.in, got, tt.want)
-		}
-	}
-
-	if got, sub := logbuf.String(), "dropping invalid bytes"; !strings.Contains(got, sub) {
-		t.Errorf("Expected substring %q in log output. Got:\n%s", sub, got)
-	}
-}
-
-func TestCookieSanitizePath(t *testing.T) {
-	defer log.SetOutput(os.Stderr)
-	var logbuf bytes.Buffer
-	log.SetOutput(&logbuf)
-
-	tests := []struct {
-		in, want string
-	}{
-		{"/path", "/path"},
-		{"/path with space/", "/path with space/"},
-		{"/just;no;semicolon\x00orstuff/", "/justnosemicolonorstuff/"},
-	}
-	for _, tt := range tests {
-		if got := sanitizeCookiePath(tt.in); got != tt.want {
-			t.Errorf("sanitizeCookiePath(%q) = %q; want %q", tt.in, got, tt.want)
-		}
-	}
-
-	if got, sub := logbuf.String(), "dropping invalid bytes"; !strings.Contains(got, sub) {
-		t.Errorf("Expected substring %q in log output. Got:\n%s", sub, got)
-	}
-}
 
=== modified file 'http13client/request.go'
--- http13client/request.go	2014-03-19 23:13:58 +0000
+++ http13client/request.go	2014-06-20 13:24:39 +0000
@@ -69,18 +69,31 @@
 
 // A Request represents an HTTP request received by a server
 // or to be sent by a client.
+//
+// The field semantics differ slightly between client and server
+// usage. In addition to the notes on the fields below, see the
+// documentation for Request.Write and RoundTripper.
 type Request struct {
-	Method string // GET, POST, PUT, etc.
+	// Method specifies the HTTP method (GET, POST, PUT, etc.).
+	// For client requests an empty string means GET.
+	Method string
 
-	// URL is created from the URI supplied on the Request-Line
-	// as stored in RequestURI.
-	//
-	// For most requests, fields other than Path and RawQuery
-	// will be empty. (See RFC 2616, Section 5.1.2)
+	// URL specifies either the URI being requested (for server
+	// requests) or the URL to access (for client requests).
+	//
+	// For server requests the URL is parsed from the URI
+	// supplied on the Request-Line as stored in RequestURI.  For
+	// most requests, fields other than Path and RawQuery will be
+	// empty. (See RFC 2616, Section 5.1.2)
+	//
+	// For client requests, the URL's Host specifies the server to
+	// connect to, while the Request's Host field optionally
+	// specifies the Host header value to send in the HTTP
+	// request.
 	URL *url.URL
 
 	// The protocol version for incoming requests.
-	// Outgoing requests always use HTTP/1.1.
+	// Client requests always use HTTP/1.1.
 	Proto      string // "HTTP/1.0"
 	ProtoMajor int    // 1
 	ProtoMinor int    // 0
@@ -104,15 +117,20 @@
 	// The request parser implements this by canonicalizing the
 	// name, making the first character and any characters
 	// following a hyphen uppercase and the rest lowercase.
+	//
+	// For client requests certain headers are automatically
+	// added and may override values in Header.
+	//
+	// See the documentation for the Request.Write method.
 	Header http.Header
 
 	// Body is the request's body.
 	//
-	// For client requests, a nil body means the request has no
+	// For client requests a nil body means the request has no
 	// body, such as a GET request. The HTTP Client's Transport
 	// is responsible for calling the Close method.
 	//
-	// For server requests, the Request Body is always non-nil
+	// For server requests the Request Body is always non-nil
 	// but will return EOF immediately when no body is present.
 	// The Server will close the request body. The ServeHTTP
 	// Handler does not need to.
@@ -122,7 +140,7 @@
 	// The value -1 indicates that the length is unknown.
 	// Values >= 0 indicate that the given number of bytes may
 	// be read from Body.
-	// For outgoing requests, a value of 0 means unknown if Body is not nil.
+	// For client requests, a value of 0 means unknown if Body is not nil.
 	ContentLength int64
 
 	// TransferEncoding lists the transfer encodings from outermost to
@@ -133,13 +151,18 @@
 	TransferEncoding []string
 
 	// Close indicates whether to close the connection after
-	// replying to this request.
+	// replying to this request (for servers) or after sending
+	// the request (for clients).
 	Close bool
 
-	// The host on which the URL is sought.
-	// Per RFC 2616, this is either the value of the Host: header
-	// or the host name given in the URL itself.
+	// For server requests Host specifies the host on which the
+	// URL is sought. Per RFC 2616, this is either the value of
+	// the "Host" header or the host name given in the URL itself.
 	// It may be of the form "host:port".
+	//
+	// For client requests Host optionally overrides the Host
+	// header to send. If empty, the Request.Write method uses
+	// the value of URL.Host.
 	Host string
 
 	// Form contains the parsed form data, including both the URL
@@ -159,12 +182,24 @@
 	// The HTTP client ignores MultipartForm and uses Body instead.
 	MultipartForm *multipart.Form
 
-	// Trailer maps trailer keys to values.  Like for Header, if the
-	// response has multiple trailer lines with the same key, they will be
-	// concatenated, delimited by commas.
-	// For server requests, Trailer is only populated after Body has been
-	// closed or fully consumed.
-	// Trailer support is only partially complete.
+	// Trailer specifies additional headers that are sent after the request
+	// body.
+	//
+	// For server requests the Trailer map initially contains only the
+	// trailer keys, with nil values. (The client declares which trailers it
+	// will later send.)  While the handler is reading from Body, it must
+	// not reference Trailer. After reading from Body returns EOF, Trailer
+	// can be read again and will contain non-nil values, if they were sent
+	// by the client.
+	//
+	// For client requests Trailer must be initialized to a map containing
+	// the trailer keys to later send. The values may be nil or their final
+	// values. The ContentLength must be 0 or -1, to send a chunked request.
+	// After the HTTP request is sent the map values can be updated while
+	// the request body is read. Once the body returns EOF, the caller must
+	// not mutate Trailer.
+	//
+	// Few HTTP clients, servers, or proxies support HTTP trailers.
 	Trailer http.Header
 
 	// RemoteAddr allows HTTP servers and other software to record
@@ -382,7 +417,6 @@
 		return err
 	}
 
-	// TODO: split long values?  (If so, should share code with Conn.Write)
 	err = req.Header.WriteSubset(w, reqWriteExcludeHeader)
 	if err != nil {
 		return err
@@ -589,32 +623,6 @@
 
 	fixPragmaCacheControl(req.Header)
 
-	// TODO: Parse specific header values:
-	//	Accept
-	//	Accept-Encoding
-	//	Accept-Language
-	//	Authorization
-	//	Cache-Control
-	//	Connection
-	//	Date
-	//	Expect
-	//	From
-	//	If-Match
-	//	If-Modified-Since
-	//	If-None-Match
-	//	If-Range
-	//	If-Unmodified-Since
-	//	Max-Forwards
-	//	Proxy-Authorization
-	//	Referer [sic]
-	//	TE (transfer-codings)
-	//	Trailer
-	//	Transfer-Encoding
-	//	Upgrade
-	//	User-Agent
-	//	Via
-	//	Warning
-
 	err = readTransfer(req, b)
 	if err != nil {
 		return nil, err
@@ -783,9 +791,7 @@
 	}
 
 	mr, err := r.multipartReader()
-	if err == ErrNotMultipart {
-		return nil
-	} else if err != nil {
+	if err != nil {
 		return err
 	}
 
@@ -863,3 +869,9 @@
 func (r *Request) wantsClose() bool {
 	return hasToken(r.Header.Get("Connection"), "close")
 }
+
+func (r *Request) closeBody() {
+	if r.Body != nil {
+		r.Body.Close()
+	}
+}
 
=== modified file 'http13client/request_test.go'
--- http13client/request_test.go	2014-03-20 09:26:28 +0000
+++ http13client/request_test.go	2014-06-20 13:24:39 +0000
@@ -155,7 +155,25 @@
 	req.Header = http.Header{"Content-Type": {"text/plain"}}
 	multipart, err = req.MultipartReader()
 	if multipart != nil {
-		t.Errorf("unexpected multipart for text/plain")
+		t.Error("unexpected multipart for text/plain")
+	}
+}
+
+func TestParseMultipartForm(t *testing.T) {
+	req := &Request{
+		Method: "POST",
+		Header: http.Header{"Content-Type": {`multipart/form-data; boundary="foo123"`}},
+		Body:   ioutil.NopCloser(new(bytes.Buffer)),
+	}
+	err := req.ParseMultipartForm(25)
+	if err == nil {
+		t.Error("expected multipart EOF, got nil")
+	}
+
+	req.Header = http.Header{"Content-Type": {"text/plain"}}
+	err = req.ParseMultipartForm(25)
+	if err != ErrNotMultipart {
+		t.Error("expected ErrNotMultipart for text/plain")
 	}
 }
 
@@ -221,16 +239,38 @@
 	validateTestMultipartContents(t, req, true)
 }
 
-func TestEmptyMultipartRequest(t *testing.T) {
-	// Test that FormValue and FormFile automatically invoke
-	// ParseMultipartForm and return the right values.
-	req, err := NewRequest("GET", "/", nil)
-	if err != nil {
-		t.Errorf("NewRequest err = %q", err)
-	}
+func TestMissingFileMultipartRequest(t *testing.T) {
+	// Test that FormFile returns an error if
+	// the named file is missing.
+	req := newTestMultipartRequest(t)
 	testMissingFile(t, req)
 }
 
+// Test that FormValue invokes ParseMultipartForm.
+func TestFormValueCallsParseMultipartForm(t *testing.T) {
+	req, _ := NewRequest("POST", "http://www.google.com/", strings.NewReader("z=post"))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded; param=value")
+	if req.Form != nil {
+		t.Fatal("Unexpected request Form, want nil")
+	}
+	req.FormValue("z")
+	if req.Form == nil {
+		t.Fatal("ParseMultipartForm not called by FormValue")
+	}
+}
+
+// Test that FormFile invokes ParseMultipartForm.
+func TestFormFileCallsParseMultipartForm(t *testing.T) {
+	req := newTestMultipartRequest(t)
+	if req.Form != nil {
+		t.Fatal("Unexpected request Form, want nil")
+	}
+	req.FormFile("")
+	if req.Form == nil {
+		t.Fatal("ParseMultipartForm not called by FormFile")
+	}
+}
+
 // Test that ParseMultipartForm errors if called
 // after MultipartReader on the same request.
 func TestParseMultipartFormOrder(t *testing.T) {
 
=== modified file 'http13client/response.go'
--- http13client/response.go	2014-03-19 23:43:25 +0000
+++ http13client/response.go	2014-06-20 13:24:39 +0000
@@ -8,6 +8,7 @@
 
 import (
 	"bufio"
+	"bytes"
 	"crypto/tls"
 	"errors"
 	"io"
@@ -47,7 +48,8 @@
 	//
 	// The http Client and Transport guarantee that Body is always
 	// non-nil, even on responses without a body or responses with
-	// a zero-lengthed body.
+	// a zero-length body. It is the caller's responsibility to
+	// close Body.
 	//
 	// The Body is automatically dechunked if the server replied
 	// with a "chunked" Transfer-Encoding.
@@ -200,7 +202,6 @@
 //
 // Body is closed after it is sent.
 func (r *Response) Write(w io.Writer) error {
-
 	// Status line
 	text := r.Status
 	if text == "" {
@@ -212,10 +213,45 @@
 	protoMajor, protoMinor := strconv.Itoa(r.ProtoMajor), strconv.Itoa(r.ProtoMinor)
 	statusCode := strconv.Itoa(r.StatusCode) + " "
 	text = strings.TrimPrefix(text, statusCode)
-	io.WriteString(w, "HTTP/"+protoMajor+"."+protoMinor+" "+statusCode+text+"\r\n")
+	if _, err := io.WriteString(w, "HTTP/"+protoMajor+"."+protoMinor+" "+statusCode+text+"\r\n"); err != nil {
+		return err
+	}
+
+	// Clone it, so we can modify r1 as needed.
+	r1 := new(Response)
+	*r1 = *r
+	if r1.ContentLength == 0 && r1.Body != nil {
+		// Is it actually 0 length? Or just unknown?
+		var buf [1]byte
+		n, err := r1.Body.Read(buf[:])
+		if err != nil && err != io.EOF {
+			return err
+		}
+		if n == 0 {
+			// Reset it to a known zero reader, in case underlying one
+			// is unhappy being read repeatedly.
+			r1.Body = eofReader
+		} else {
+			r1.ContentLength = -1
+			r1.Body = struct {
+				io.Reader
+				io.Closer
+			}{
+				io.MultiReader(bytes.NewReader(buf[:1]), r.Body),
+				r.Body,
+			}
+		}
+	}
+	// If we're sending a non-chunked HTTP/1.1 response without a
+	// content-length, the only way to do that is the old HTTP/1.0
+	// way, by noting the EOF with a connection close, so we need
+	// to set Close.
+	if r1.ContentLength == -1 && !r1.Close && r1.ProtoAtLeast(1, 1) && !chunked(r1.TransferEncoding) {
+		r1.Close = true
+	}
 
 	// Process Body,ContentLength,Close,Trailer
-	tw, err := newTransferWriter(r)
+	tw, err := newTransferWriter(r1)
 	if err != nil {
 		return err
 	}
@@ -230,8 +266,19 @@
 		return err
 	}
 
+	// contentLengthAlreadySent may have been already sent for
+	// POST/PUT requests, even if zero length. See Issue 8180.
+	contentLengthAlreadySent := tw.shouldSendContentLength()
+	if r1.ContentLength == 0 && !chunked(r1.TransferEncoding) && !contentLengthAlreadySent {
+		if _, err := io.WriteString(w, "Content-Length: 0\r\n"); err != nil {
+			return err
+		}
+	}
+
 	// End-of-header
-	io.WriteString(w, "\r\n")
+	if _, err := io.WriteString(w, "\r\n"); err != nil {
+		return err
+	}
 
 	// Write body and trailer
 	err = tw.WriteBody(w)
 
=== modified file 'http13client/response_test.go'
--- http13client/response_test.go	2014-03-19 23:13:58 +0000
+++ http13client/response_test.go	2014-06-20 13:24:39 +0000
@@ -30,6 +30,10 @@
 	return &Request{Method: method}
 }
 
+func dummyReq11(method string) *Request {
+	return &Request{Method: method, Proto: "HTTP/1.1", ProtoMajor: 1, ProtoMinor: 1}
+}
+
 var respTests = []respTest{
 	// Unchunked response without Content-Length.
 	{
 
=== modified file 'http13client/responsewrite_test.go'
--- http13client/responsewrite_test.go	2014-03-19 23:13:58 +0000
+++ http13client/responsewrite_test.go	2014-06-20 13:24:39 +0000
@@ -27,7 +27,7 @@
 				ProtoMinor:    0,
 				Request:       dummyReq("GET"),
 				Header:        http.Header{},
-				Body:          ioutil.NopCloser(bytes.NewBufferString("abcdef")),
+				Body:          ioutil.NopCloser(strings.NewReader("abcdef")),
 				ContentLength: 6,
 			},
 
@@ -50,6 +50,106 @@
 				"\r\n" +
 				"abcdef",
 		},
+		// HTTP/1.1 response with unknown length and Connection: close
+		{
+			Response{
+				StatusCode:    200,
+				ProtoMajor:    1,
+				ProtoMinor:    1,
+				Request:       dummyReq("GET"),
+				Header:        http.Header{},
+				Body:          ioutil.NopCloser(strings.NewReader("abcdef")),
+				ContentLength: -1,
+				Close:         true,
+			},
+			"HTTP/1.1 200 OK\r\n" +
+				"Connection: close\r\n" +
+				"\r\n" +
+				"abcdef",
+		},
+		// HTTP/1.1 response with unknown length and not setting connection: close
+		{
+			Response{
+				StatusCode:    200,
+				ProtoMajor:    1,
+				ProtoMinor:    1,
+				Request:       dummyReq11("GET"),
+				Header:        http.Header{},
+				Body:          ioutil.NopCloser(strings.NewReader("abcdef")),
+				ContentLength: -1,
+				Close:         false,
+			},
+			"HTTP/1.1 200 OK\r\n" +
+				"Connection: close\r\n" +
+				"\r\n" +
+				"abcdef",
+		},
+		// HTTP/1.1 response with unknown length and not setting connection: close, but
+		// setting chunked.
+		{
+			Response{
+				StatusCode:       200,
+				ProtoMajor:       1,
+				ProtoMinor:       1,
+				Request:          dummyReq11("GET"),
+				Header:           http.Header{},
+				Body:             ioutil.NopCloser(strings.NewReader("abcdef")),
+				ContentLength:    -1,
+				TransferEncoding: []string{"chunked"},
+				Close:            false,
+			},
+			"HTTP/1.1 200 OK\r\n" +
+				"Transfer-Encoding: chunked\r\n\r\n" +
+				"6\r\nabcdef\r\n0\r\n\r\n",
+		},
+		// HTTP/1.1 response 0 content-length, and nil body
+		{
+			Response{
+				StatusCode:    200,
+				ProtoMajor:    1,
+				ProtoMinor:    1,
+				Request:       dummyReq11("GET"),
+				Header:        http.Header{},
+				Body:          nil,
+				ContentLength: 0,
+				Close:         false,
+			},
+			"HTTP/1.1 200 OK\r\n" +
+				"Content-Length: 0\r\n" +
+				"\r\n",
+		},
+		// HTTP/1.1 response 0 content-length, and non-nil empty body
+		{
+			Response{
+				StatusCode:    200,
+				ProtoMajor:    1,
+				ProtoMinor:    1,
+				Request:       dummyReq11("GET"),
+				Header:        http.Header{},
+				Body:          ioutil.NopCloser(strings.NewReader("")),
+				ContentLength: 0,
+				Close:         false,
+			},
+			"HTTP/1.1 200 OK\r\n" +
+				"Content-Length: 0\r\n" +
+				"\r\n",
+		},
+		// HTTP/1.1 response 0 content-length, and non-nil non-empty body
+		{
+			Response{
+				StatusCode:    200,
+				ProtoMajor:    1,
+				ProtoMinor:    1,
+				Request:       dummyReq11("GET"),
+				Header:        http.Header{},
+				Body:          ioutil.NopCloser(strings.NewReader("foo")),
+				ContentLength: 0,
+				Close:         false,
+			},
+			"HTTP/1.1 200 OK\r\n" +
+				"Connection: close\r\n" +
+				"\r\nfoo",
+		},
 		// HTTP/1.1, chunked coding; empty trailer; close
 		{
 			Response{
@@ -92,6 +192,22 @@
 				"Foo: Bar Baz\r\n" +
 				"\r\n",
 		},
+
+		// Want a single Content-Length header. Fixing issue 8180 where
+		// there were two.
+		{
+			Response{
+				StatusCode:       http.StatusOK,
+				ProtoMajor:       1,
+				ProtoMinor:       1,
+				Request:          &Request{Method: "POST"},
+				Header:           http.Header{},
+				ContentLength:    0,
+				TransferEncoding: nil,
+				Body:             nil,
+			},
+			"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
+		},
 	}
 
 	for i := range respWriteTests {
 
=== modified file 'http13client/server.go'
--- http13client/server.go	2014-03-19 23:13:58 +0000
+++ http13client/server.go	2014-06-20 13:24:39 +0000
@@ -10,21 +10,27 @@
 	"io/ioutil"
 	"log"
 	"net"
-	"strings"
 	"sync"
 )
 
+type eofReaderWithWriteTo struct{}
+
+func (eofReaderWithWriteTo) WriteTo(io.Writer) (int64, error) { return 0, nil }
+func (eofReaderWithWriteTo) Read([]byte) (int, error)         { return 0, io.EOF }
+
 // eofReader is a non-nil io.ReadCloser that always returns EOF.
-// It embeds a *strings.Reader so it still has a WriteTo method
-// and io.Copy won't need a buffer.
+// It has a WriteTo method so io.Copy won't need a buffer.
 var eofReader = &struct {
-	*strings.Reader
+	eofReaderWithWriteTo
 	io.Closer
 }{
-	strings.NewReader(""),
+	eofReaderWithWriteTo{},
 	ioutil.NopCloser(nil),
 }
 
+// Verify that an io.Copy from an eofReader won't require a buffer.
+var _ io.WriterTo = eofReader
+
 // loggingConn is used for debugging.
 type loggingConn struct {
 	name string
 
=== modified file 'http13client/transfer.go'
--- http13client/transfer.go	2014-03-19 23:13:58 +0000
+++ http13client/transfer.go	2014-06-20 13:24:39 +0000
@@ -13,6 +13,7 @@
 	"io/ioutil"
 	"net/http"
 	"net/textproto"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -144,11 +145,10 @@
 	return false
 }
 
-func (t *transferWriter) WriteHeader(w io.Writer) (err error) {
+func (t *transferWriter) WriteHeader(w io.Writer) error {
 	if t.Close {
-		_, err = io.WriteString(w, "Connection: close\r\n")
-		if err != nil {
-			return
+		if _, err := io.WriteString(w, "Connection: close\r\n"); err != nil {
+			return err
 		}
 	}
 
@@ -156,43 +156,44 @@
 	// function of the sanitized field triple (Body, ContentLength,
 	// TransferEncoding)
 	if t.shouldSendContentLength() {
-		io.WriteString(w, "Content-Length: ")
-		_, err = io.WriteString(w, strconv.FormatInt(t.ContentLength, 10)+"\r\n")
-		if err != nil {
-			return
+		if _, err := io.WriteString(w, "Content-Length: "); err != nil {
+			return err
+		}
+		if _, err := io.WriteString(w, strconv.FormatInt(t.ContentLength, 10)+"\r\n"); err != nil {
+			return err
 		}
 	} else if chunked(t.TransferEncoding) {
-		_, err = io.WriteString(w, "Transfer-Encoding: chunked\r\n")
-		if err != nil {
-			return
+		if _, err := io.WriteString(w, "Transfer-Encoding: chunked\r\n"); err != nil {
+			return err
 		}
 	}
 
 	// Write Trailer header
 	if t.Trailer != nil {
-		// TODO: At some point, there should be a generic mechanism for
-		// writing long headers, using HTTP line splitting
-		io.WriteString(w, "Trailer: ")
-		needComma := false
+		keys := make([]string, 0, len(t.Trailer))
 		for k := range t.Trailer {
 			k = http.CanonicalHeaderKey(k)
 			switch k {
 			case "Transfer-Encoding", "Trailer", "Content-Length":
 				return &badStringError{"invalid Trailer key", k}
 			}
-			if needComma {
-				io.WriteString(w, ",")
+			keys = append(keys, k)
+		}
+		if len(keys) > 0 {
+			sort.Strings(keys)
+			// TODO: could do better allocation-wise here, but trailers are rare,
+			// so being lazy for now.
+			if _, err := io.WriteString(w, "Trailer: "+strings.Join(keys, ",")+"\r\n"); err != nil {
+				return err
 			}
-			io.WriteString(w, k)
-			needComma = true
 		}
-		_, err = io.WriteString(w, "\r\n")
 	}
 
-	return
+	return nil
 }
 
-func (t *transferWriter) WriteBody(w io.Writer) (err error) {
+func (t *transferWriter) WriteBody(w io.Writer) error {
+	var err error
 	var ncopy int64
 
 	// Write body
@@ -229,11 +230,16 @@
 
 	// TODO(petar): Place trailer writer code here.
 	if chunked(t.TransferEncoding) {
+		// Write Trailer header
+		if t.Trailer != nil {
+			if err := t.Trailer.Write(w); err != nil {
+				return err
+			}
+		}
 		// Last chunk, empty trailer
 		_, err = io.WriteString(w, "\r\n")
 	}
-
-	return
+	return err
 }
 
 type transferReader struct {
@@ -265,6 +271,22 @@
 	return true
 }
 
+var (
+	suppressedHeaders304    = []string{"Content-Type", "Content-Length", "Transfer-Encoding"}
+	suppressedHeadersNoBody = []string{"Content-Length", "Transfer-Encoding"}
+)
+
+func suppressedHeaders(status int) []string {
+	switch {
+	case status == 304:
+		// RFC 2616 section 10.3.5: "the response MUST NOT include other entity-headers"
+		return suppressedHeaders304
+	case !bodyAllowedForStatus(status):
+		return suppressedHeadersNoBody
+	}
+	return nil
+}
+
 // msg is *Request or *Response.
 func readTransfer(msg interface{}, r *bufio.Reader) (err error) {
 	t := &transferReader{RequestMethod: "GET"}
@@ -511,7 +533,7 @@
 		case "Transfer-Encoding", "Trailer", "Content-Length":
 			return nil, &badStringError{"bad trailer key", key}
 		}
-		trailer.Del(key)
+		trailer[key] = nil
 	}
 	if len(trailer) == 0 {
 		return nil, nil
@@ -643,13 +665,23 @@
 	}
 	switch rr := b.hdr.(type) {
 	case *Request:
-		rr.Trailer = http.Header(hdr)
+		mergeSetHeader(&rr.Trailer, http.Header(hdr))
 	case *Response:
-		rr.Trailer = http.Header(hdr)
+		mergeSetHeader(&rr.Trailer, http.Header(hdr))
 	}
 	return nil
 }
 
+func mergeSetHeader(dst *http.Header, src http.Header) {
+	if *dst == nil {
+		*dst = src
+		return
+	}
+	for k, vv := range src {
+		(*dst)[k] = vv
+	}
+}
+
 func (b *body) Close() error {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 
=== modified file 'http13client/transport.go'
--- http13client/transport.go	2014-03-20 09:26:28 +0000
+++ http13client/transport.go	2014-06-20 13:24:39 +0000
@@ -110,6 +110,9 @@
 // An error is returned if the proxy environment is invalid.
 // A nil URL and nil error are returned if no proxy is defined in the
 // environment, or a proxy should not be used for the given request.
+//
+// As a special case, if req.URL.Host is "localhost" (with or without
+// a port number), then a nil URL and nil error will be returned.
 func ProxyFromEnvironment(req *Request) (*url.URL, error) {
 	proxy := httpProxyEnv.Get()
 	if proxy == "" {
@@ -161,9 +164,11 @@
 // and redirects), see Get, Post, and the Client type.
 func (t *Transport) RoundTrip(req *Request) (resp *Response, err error) {
 	if req.URL == nil {
+		req.closeBody()
 		return nil, errors.New("http: nil Request.URL")
 	}
 	if req.Header == nil {
+		req.closeBody()
 		return nil, errors.New("http: nil Request.Header")
 	}
 	if req.URL.Scheme != "http" && req.URL.Scheme != "https" {
@@ -174,16 +179,19 @@
 		}
 		t.altMu.RUnlock()
 		if rt == nil {
+			req.closeBody()
 			return nil, &badStringError{"unsupported protocol scheme", req.URL.Scheme}
 		}
 		return rt.RoundTrip(req)
 	}
 	if req.URL.Host == "" {
+		req.closeBody()
 		return nil, errors.New("http: no Host in request URL")
 	}
 	treq := &transportRequest{Request: req}
 	cm, err := t.connectMethodForRequest(treq)
 	if err != nil {
+		req.closeBody()
 		return nil, err
 	}
 
@@ -194,6 +202,7 @@
 	pconn, err := t.getConn(req, cm)
 	if err != nil {
 		t.setReqCanceler(req, nil)
+		req.closeBody()
 		return nil, err
 	}
 
@@ -231,9 +240,6 @@
 	t.idleConn = nil
 	t.idleConnCh = nil
 	t.idleMu.Unlock()
-	if m == nil {
-		return
-	}
 	for _, conns := range m {
 		for _, pconn := range conns {
 			pconn.close()
@@ -499,12 +505,13 @@
 	pa := cm.proxyAuth()
 
 	pconn := &persistConn{
-		t:        t,
-		cacheKey: cm.key(),
-		conn:     conn,
-		reqch:    make(chan requestAndChan, 50),
-		writech:  make(chan writeRequest, 50),
-		closech:  make(chan struct{}),
+		t:          t,
+		cacheKey:   cm.key(),
+		conn:       conn,
+		reqch:      make(chan requestAndChan, 1),
+		writech:    make(chan writeRequest, 1),
+		closech:    make(chan struct{}),
+		writeErrCh: make(chan error, 1),
 	}
 
 	switch {
@@ -589,7 +596,7 @@
 		pconn.conn = tlsConn
 	}
 
-	pconn.br = bufio.NewReader(pconn.conn)
+	pconn.br = bufio.NewReader(noteEOFReader{pconn.conn, &pconn.sawEOF})
 	pconn.bw = bufio.NewWriter(pconn.conn)
 	go pconn.readLoop()
 	go pconn.writeLoop()
@@ -722,16 +729,22 @@
 	cacheKey connectMethodKey
 	conn     net.Conn
 	tlsState *tls.ConnectionState
-	closed   bool                // whether conn has been closed
 	br       *bufio.Reader       // from conn
+	sawEOF   bool                // whether we've seen EOF from conn; owned by readLoop
 	bw       *bufio.Writer       // to conn
 	reqch    chan requestAndChan // written by roundTrip; read by readLoop
 	writech  chan writeRequest   // written by roundTrip; read by writeLoop
-	closech  chan struct{}       // broadcast close when readLoop (TCP connection) closes
+	closech  chan struct{}       // closed when conn closed
 	isProxy  bool
+	// writeErrCh passes the request write error (usually nil)
+	// from the writeLoop goroutine to the readLoop which passes
+	// it off to the res.Body reader, which then uses it to decide
+	// whether or not a connection can be reused. Issue 7569.
+	writeErrCh chan error
 
-	lk                   sync.Mutex // guards following 3 fields
+	lk                   sync.Mutex // guards following fields
 	numExpectedResponses int
+	closed               bool // whether conn has been closed
 	broken               bool // an error has happened on this connection; marked broken so it's not reused.
 	// mutateHeaderFunc is an optional func to modify extra
 	// headers on each outbound request before it's written. (the
@@ -739,6 +752,7 @@
 	mutateHeaderFunc func(http.Header)
 }
 
+// isBroken reports whether this connection is in a known broken state.
 func (pc *persistConn) isBroken() bool {
 	pc.lk.Lock()
 	b := pc.broken
@@ -763,7 +777,6 @@
 }
 
 func (pc *persistConn) readLoop() {
-	defer close(pc.closech)
 	alive := true
 
 	for alive {
@@ -771,12 +784,14 @@
 
 		pc.lk.Lock()
 		if pc.numExpectedResponses == 0 {
-			pc.closeLocked()
+			if !pc.closed {
+				pc.closeLocked()
+				if len(pb) > 0 {
+					log.Printf("Unsolicited response received on idle HTTP channel starting with %q; err=%v",
+						string(pb), err)
+				}
+			}
 			pc.lk.Unlock()
-			if len(pb) > 0 {
-				log.Printf("Unsolicited response received on idle HTTP channel starting with %q; err=%v",
-					string(pb), err)
-			}
 			return
 		}
 		pc.lk.Unlock()
@@ -809,13 +824,7 @@
 				resp.Header.Del("Content-Encoding")
 				resp.Header.Del("Content-Length")
 				resp.ContentLength = -1
-				gzReader, zerr := gzip.NewReader(resp.Body)
-				if zerr != nil {
-					pc.close()
-					err = zerr
-				} else {
-					resp.Body = &readerAndCloser{gzReader, resp.Body}
-				}
+				resp.Body = &gzipReader{body: resp.Body}
 			}
 			resp.Body = &bodyEOFSignal{body: resp.Body}
 		}
@@ -838,24 +847,18 @@
 				return nil
 			}
 			resp.Body.(*bodyEOFSignal).fn = func(err error) {
-				alive1 := alive
-				if err != nil {
-					alive1 = false
-				}
-				if alive1 && !pc.t.putIdleConn(pc) {
-					alive1 = false
-				}
-				if !alive1 || pc.isBroken() {
-					pc.close()
-				}
-				waitForBodyRead <- alive1
+				waitForBodyRead <- alive &&
+					err == nil &&
+					!pc.sawEOF &&
+					pc.wroteRequest() &&
+					pc.t.putIdleConn(pc)
 			}
 		}
 
 		if alive && !hasBody {
-			if !pc.t.putIdleConn(pc) {
-				alive = false
-			}
+			alive = !pc.sawEOF &&
+				pc.wroteRequest() &&
+				pc.t.putIdleConn(pc)
 		}
 
 		rc.ch <- responseAndError{resp, err}
@@ -863,7 +866,11 @@
 		// Wait for the just-returned response body to be fully consumed
 		// before we race and peek on the underlying bufio reader.
 		if waitForBodyRead != nil {
-			alive = <-waitForBodyRead
+			select {
+			case alive = <-waitForBodyRead:
+			case <-pc.closech:
+				alive = false
+			}
 		}
 
 		pc.t.setReqCanceler(rc.req, nil)
@@ -888,14 +895,44 @@
 			}
 			if err != nil {
 				pc.markBroken()
+				wr.req.Request.closeBody()
 			}
-			wr.ch <- err
+			pc.writeErrCh <- err // to the body reader, which might recycle us
+			wr.ch <- err         // to the roundTrip function
 		case <-pc.closech:
 			return
 		}
 	}
 }
 
+// wroteRequest is a check before recycling a connection that the previous write
+// (from writeLoop above) happened and was successful.
+func (pc *persistConn) wroteRequest() bool {
+	select {
+	case err := <-pc.writeErrCh:
+		// Common case: the write happened well before the response, so
+		// avoid creating a timer.
+		return err == nil
+	default:
+		// Rare case: the request was written in writeLoop above but
+		// before it could send to pc.writeErrCh, the reader read it
+		// all, processed it, and called us here. In this case, give the
+		// write goroutine a bit of time to finish its send.
+		//
+		// Less rare case: We also get here in the legitimate case of
+		// Issue 7569, where the writer is still writing (or stalled),
+		// but the server has already replied. In this case, we don't
+		// want to wait too long, and we want to return false so this
+		// connection isn't re-used.
+		select {
+		case err := <-pc.writeErrCh:
+			return err == nil
+		case <-time.After(50 * time.Millisecond):
+			return false
+		}
+	}
+}
+
 type responseAndError struct {
 	res *Response
 	err error
@@ -1043,6 +1080,7 @@
 	if !pc.closed {
 		pc.conn.Close()
 		pc.closed = true
+		close(pc.closech)
 	}
 	pc.mutateHeaderFunc = nil
 }
@@ -1125,6 +1163,27 @@
 	es.fn = nil
 }
 
+// gzipReader wraps a response body so it can lazily
+// call gzip.NewReader on the first call to Read
+type gzipReader struct {
+	body io.ReadCloser // underlying Response.Body
+	zr   io.Reader     // lazily-initialized gzip reader
+}
+
+func (gz *gzipReader) Read(p []byte) (n int, err error) {
+	if gz.zr == nil {
+		gz.zr, err = gzip.NewReader(gz.body)
+		if err != nil {
+			return 0, err
+		}
+	}
+	return gz.zr.Read(p)
+}
+
+func (gz *gzipReader) Close() error {
+	return gz.body.Close()
+}
+
 type readerAndCloser struct {
 	io.Reader
 	io.Closer
@@ -1135,3 +1194,16 @@
 func (tlsHandshakeTimeoutError) Timeout() bool   { return true }
 func (tlsHandshakeTimeoutError) Temporary() bool { return true }
 func (tlsHandshakeTimeoutError) Error() string   { return "net/http: TLS handshake timeout" }
+
+type noteEOFReader struct {
+	r      io.Reader
+	sawEOF *bool
+}
+
+func (nr noteEOFReader) Read(p []byte) (n int, err error) {
+	n, err = nr.r.Read(p)
+	if err == io.EOF {
+		*nr.sawEOF = true
+	}
+	return
+}
 
=== modified file 'http13client/transport_test.go'
--- http13client/transport_test.go	2014-03-20 09:26:28 +0000
+++ http13client/transport_test.go	2014-06-20 13:24:39 +0000
@@ -11,6 +11,7 @@
 	"bytes"
 	"compress/gzip"
 	"crypto/rand"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
@@ -56,21 +57,21 @@
 // been closed.
 type testConnSet struct {
 	t      *testing.T
+	mu     sync.Mutex // guards closed and list
 	closed map[net.Conn]bool
 	list   []net.Conn // in order created
-	mutex  sync.Mutex
 }
 
 func (tcs *testConnSet) insert(c net.Conn) {
-	tcs.mutex.Lock()
-	defer tcs.mutex.Unlock()
+	tcs.mu.Lock()
+	defer tcs.mu.Unlock()
 	tcs.closed[c] = false
 	tcs.list = append(tcs.list, c)
 }
 
 func (tcs *testConnSet) remove(c net.Conn) {
-	tcs.mutex.Lock()
-	defer tcs.mutex.Unlock()
+	tcs.mu.Lock()
+	defer tcs.mu.Unlock()
 	tcs.closed[c] = true
 }
 
@@ -93,11 +94,19 @@
 }
 
 func (tcs *testConnSet) check(t *testing.T) {
-	tcs.mutex.Lock()
-	defer tcs.mutex.Unlock()
-
-	for i, c := range tcs.list {
-		if !tcs.closed[c] {
+	tcs.mu.Lock()
+	defer tcs.mu.Unlock()
+	for i := 4; i >= 0; i-- {
+		for i, c := range tcs.list {
+			if tcs.closed[c] {
+				continue
+			}
+			if i != 0 {
+				tcs.mu.Unlock()
+				time.Sleep(50 * time.Millisecond)
+				tcs.mu.Lock()
+				continue
+			}
 			t.Errorf("TCP connection #%d, %p (of %d total) was not closed", i+1, c, len(tcs.list))
 		}
 	}
@@ -794,6 +803,33 @@
 	}
 }
 
+// golang.org/issue/7750: request fails when server replies with
+// a short gzip body
+func TestTransportGzipShort(t *testing.T) {
+	defer afterTest(t)
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Encoding", "gzip")
+		w.Write([]byte{0x1f, 0x8b})
+	}))
+	defer ts.Close()
+
+	tr := &Transport{}
+	defer tr.CloseIdleConnections()
+	c := &Client{Transport: tr}
+	res, err := c.Get(ts.URL)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer res.Body.Close()
+	_, err = ioutil.ReadAll(res.Body)
+	if err == nil {
+		t.Fatal("Expect an error from reading a body.")
+	}
+	if err != io.ErrUnexpectedEOF {
+		t.Errorf("ReadAll error = %v; want io.ErrUnexpectedEOF", err)
+	}
+}
+
 // tests that persistent goroutine connections shut down when no longer desired.
 func TestTransportPersistConnLeak(t *testing.T) {
 	if runtime.GOOS == "plan9" {
@@ -1214,9 +1250,13 @@
 	if testing.Short() {
 		t.Skip("skipping timeout test in -short mode")
 	}
+	inHandler := make(chan bool, 1)
 	mux := http.NewServeMux()
-	mux.HandleFunc("/fast", func(w http.ResponseWriter, r *http.Request) {})
+	mux.HandleFunc("/fast", func(w http.ResponseWriter, r *http.Request) {
+		inHandler <- true
+	})
 	mux.HandleFunc("/slow", func(w http.ResponseWriter, r *http.Request) {
+		inHandler <- true
 		time.Sleep(2 * time.Second)
 	})
 	ts := httptest.NewServer(mux)
@@ -1239,6 +1279,12 @@
 	}
 	for i, tt := range tests {
 		res, err := c.Get(ts.URL + tt.path)
+		select {
+		case <-inHandler:
+		case <-time.After(5 * time.Second):
+			t.Errorf("never entered handler for test index %d, %s", i, tt.path)
+			continue
+		}
 		if err != nil {
 			uerr, ok := err.(*url.Error)
 			if !ok {
@@ -1366,7 +1412,6 @@
 	case <-gotres:
 	case <-time.After(5 * time.Second):
 		panic("hang. events are: " + logbuf.String())
-		t.Fatal("timeout; cancel didn't work?")
 	}
 
 	got := logbuf.String()
@@ -1508,8 +1553,10 @@
 	dialGate := make(chan bool, 1)
 	tr := &Transport{
 		Dial: func(n, addr string) (net.Conn, error) {
-			<-dialGate
-			return net.Dial(n, addr)
+			if <-dialGate {
+				return net.Dial(n, addr)
+			}
+			return nil, errors.New("manually closed")
 		},
 		DisableKeepAlives: false,
 	}
@@ -1544,7 +1591,7 @@
 		t.Fatalf("/foo came from conn %q; /bar came from %q instead", fooAddr, barAddr)
 	}
 	barRes.Body.Close()
-	dialGate <- true
+	dialGate <- false
 }
 
 // Issue 2184
@@ -1823,10 +1870,10 @@
 			return
 		}
 		if !ne.Timeout() {
-			t.Error("expected timeout error; got %v", err)
+			t.Errorf("expected timeout error; got %v", err)
 		}
 		if !strings.Contains(err.Error(), "handshake timeout") {
-			t.Error("expected 'handshake timeout' in error; got %v", err)
+			t.Errorf("expected 'handshake timeout' in error; got %v", err)
 		}
 	}()
 	select {
@@ -1836,6 +1883,238 @@
 	}
 }
 
+// Trying to repro golang.org/issue/3514
+func TestTLSServerClosesConnection(t *testing.T) {
+	defer afterTest(t)
+	if runtime.GOOS == "windows" {
+		t.Skip("skipping flaky test on Windows; golang.org/issue/7634")
+	}
+	closedc := make(chan bool, 1)
+	ts := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if strings.Contains(r.URL.Path, "/keep-alive-then-die") {
+			conn, _, _ := w.(http.Hijacker).Hijack()
+			conn.Write([]byte("HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nfoo"))
+			conn.Close()
+			closedc <- true
+			return
+		}
+		fmt.Fprintf(w, "hello")
+	}))
+	defer ts.Close()
+	tr := &Transport{
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: true,
+		},
+	}
+	defer tr.CloseIdleConnections()
+	client := &Client{Transport: tr}
+
+	var nSuccess = 0
+	var errs []error
+	const trials = 20
+	for i := 0; i < trials; i++ {
+		tr.CloseIdleConnections()
+		res, err := client.Get(ts.URL + "/keep-alive-then-die")
+		if err != nil {
+			t.Fatal(err)
+		}
+		<-closedc
+		slurp, err := ioutil.ReadAll(res.Body)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if string(slurp) != "foo" {
+			t.Errorf("Got %q, want foo", slurp)
+		}
+
+		// Now try again and see if we successfully
+		// pick a new connection.
+		res, err = client.Get(ts.URL + "/")
+		if err != nil {
+			errs = append(errs, err)
+			continue
+		}
+		slurp, err = ioutil.ReadAll(res.Body)
+		if err != nil {
+			errs = append(errs, err)
+			continue
+		}
+		nSuccess++
+	}
+	if nSuccess > 0 {
+		t.Logf("successes = %d of %d", nSuccess, trials)
+	} else {
+		t.Errorf("All runs failed:")
+	}
+	for _, err := range errs {
+		t.Logf("  err: %v", err)
+	}
+}
+
+// byteFromChanReader is an io.Reader that reads a single byte at a
+// time from the channel.  When the channel is closed, the reader
+// returns io.EOF.
+type byteFromChanReader chan byte
+
+func (c byteFromChanReader) Read(p []byte) (n int, err error) {
+	if len(p) == 0 {
+		return
+	}
+	b, ok := <-c
+	if !ok {
+		return 0, io.EOF
+	}
+	p[0] = b
+	return 1, nil
+}
+
+// Verifies that the Transport doesn't reuse a connection in the case
+// where the server replies before the request has been fully
+// written. We still honor that reply (see TestIssue3595), but don't
+// send future requests on the connection because it's then in a
+// questionable state.
+// golang.org/issue/7569
+func TestTransportNoReuseAfterEarlyResponse(t *testing.T) {
+	defer afterTest(t)
+	var sconn struct {
+		sync.Mutex
+		c net.Conn
+	}
+	var getOkay bool
+	closeConn := func() {
+		sconn.Lock()
+		defer sconn.Unlock()
+		if sconn.c != nil {
+			sconn.c.Close()
+			sconn.c = nil
+			if !getOkay {
+				t.Logf("Closed server connection")
+			}
+		}
+	}
+	defer closeConn()
+
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method == "GET" {
+			io.WriteString(w, "bar")
+			return
+		}
+		conn, _, _ := w.(http.Hijacker).Hijack()
+		sconn.Lock()
+		sconn.c = conn
+		sconn.Unlock()
+		conn.Write([]byte("HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nfoo")) // keep-alive
+		go io.Copy(ioutil.Discard, conn)
+	}))
+	defer ts.Close()
+	tr := &Transport{}
+	defer tr.CloseIdleConnections()
+	client := &Client{Transport: tr}
+
+	const bodySize = 256 << 10
+	finalBit := make(byteFromChanReader, 1)
+	req, _ := NewRequest("POST", ts.URL, io.MultiReader(io.LimitReader(neverEnding('x'), bodySize-1), finalBit))
+	req.ContentLength = bodySize
+	res, err := client.Do(req)
+	if err := wantBody(res, err, "foo"); err != nil {
+		t.Errorf("POST response: %v", err)
+	}
+	donec := make(chan bool)
+	go func() {
+		defer close(donec)
+		res, err = client.Get(ts.URL)
+		if err := wantBody(res, err, "bar"); err != nil {
+			t.Errorf("GET response: %v", err)
+			return
+		}
+		getOkay = true // suppress test noise
+	}()
+	time.AfterFunc(5*time.Second, closeConn)
+	select {
+	case <-donec:
+		finalBit <- 'x' // unblock the writeloop of the first Post
+		close(finalBit)
+	case <-time.After(7 * time.Second):
+		t.Fatal("timeout waiting for GET request to finish")
+	}
+}
+
+type errorReader struct {
+	err error
+}
+
+func (e errorReader) Read(p []byte) (int, error) { return 0, e.err }
+
+type closerFunc func() error
+
+func (f closerFunc) Close() error { return f() }
+
+// Issue 6981
+func TestTransportClosesBodyOnError(t *testing.T) {
+	if runtime.GOOS == "plan9" {
+		t.Skip("skipping test; see http://golang.org/issue/7782")
+	}
+	defer afterTest(t)
+	readBody := make(chan error, 1)
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		_, err := ioutil.ReadAll(r.Body)
+		readBody <- err
+	}))
+	defer ts.Close()
+	fakeErr := errors.New("fake error")
+	didClose := make(chan bool, 1)
+	req, _ := NewRequest("POST", ts.URL, struct {
+		io.Reader
+		io.Closer
+	}{
+		io.MultiReader(io.LimitReader(neverEnding('x'), 1<<20), errorReader{fakeErr}),
+		closerFunc(func() error {
+			select {
+			case didClose <- true:
+			default:
+			}
+			return nil
+		}),
+	})
+	res, err := DefaultClient.Do(req)
+	if res != nil {
+		defer res.Body.Close()
+	}
+	if err == nil || !strings.Contains(err.Error(), fakeErr.Error()) {
+		t.Fatalf("Do error = %v; want something containing %q", err, fakeErr.Error())
+	}
+	select {
+	case err := <-readBody:
+		if err == nil {
+			t.Errorf("Unexpected success reading request body from handler; want 'unexpected EOF reading trailer'")
+		}
+	case <-time.After(5 * time.Second):
+		t.Error("timeout waiting for server handler to complete")
+	}
+	select {
+	case <-didClose:
+	default:
+		t.Errorf("didn't see Body.Close")
+	}
+}
+
+func wantBody(res *Response, err error, want string) error {
+	if err != nil {
+		return err
+	}
+	slurp, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return fmt.Errorf("error reading body: %v", err)
+	}
+	if string(slurp) != want {
+		return fmt.Errorf("body = %q; want %q", slurp, want)
+	}
+	if err := res.Body.Close(); err != nil {
+		return fmt.Errorf("body Close = %v", err)
+	}
+	return nil
+}
+
 func newLocalListener(t *testing.T) net.Listener {
 	ln, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {