From: Russ Cox <rsc@golang.org>
Date: Wed, 20 Oct 2010 03:29:25 +0000 (-0400)
Subject: http: do not close connection after sending HTTP/1.0 request
X-Git-Tag: weekly.2010-10-20~16
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=17c32ad712fb724299008587f9fe977c4b381529;p=gostls13.git

http: do not close connection after sending HTTP/1.0 request

Fixes #671.

R=adg, cw
CC=golang-dev
https://golang.org/cl/2431042
---

diff --git a/src/pkg/http/transfer.go b/src/pkg/http/transfer.go
index ee463fea10..40945e49fc 100644
--- a/src/pkg/http/transfer.go
+++ b/src/pkg/http/transfer.go
@@ -184,6 +184,7 @@ func readTransfer(msg interface{}, r *bufio.Reader) (err os.Error) {
 		t.RequestMethod = rr.RequestMethod
 		t.ProtoMajor = rr.ProtoMajor
 		t.ProtoMinor = rr.ProtoMinor
+		t.Close = shouldClose(t.ProtoMajor, t.ProtoMinor, t.Header)
 	case *Request:
 		t.Header = rr.Header
 		t.ProtoMajor = rr.ProtoMajor
@@ -210,9 +211,6 @@ func readTransfer(msg interface{}, r *bufio.Reader) (err os.Error) {
 		return err
 	}
 
-	// Closing
-	t.Close = shouldClose(t.ProtoMajor, t.ProtoMinor, t.Header)
-
 	// Trailer
 	t.Trailer, err = fixTrailer(t.Header, t.TransferEncoding)
 	if err != nil {