From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Tue, 15 Nov 2011 05:04:58 +0000 (+0900)
Subject: net/http: fix build
X-Git-Tag: weekly.2011-11-18~55
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8998673cc60a53013f6461fecf90b25abd003982;p=gostls13.git

net/http: fix build

empty is already not a nil.

R=golang-dev, bradfitz, rsc
CC=golang-dev
https://golang.org/cl/5376099
---

diff --git a/src/pkg/net/http/readrequest_test.go b/src/pkg/net/http/readrequest_test.go
index 2219d43316..c64fff6109 100644
--- a/src/pkg/net/http/readrequest_test.go
+++ b/src/pkg/net/http/readrequest_test.go
@@ -70,7 +70,6 @@ var reqTests = []reqTest{
 			Close:         false,
 			ContentLength: 7,
 			Host:          "www.techcrunch.com",
-			Form:          url.Values{},
 		},
 
 		"abcdef\n",
@@ -94,10 +93,10 @@ var reqTests = []reqTest{
 			Proto:         "HTTP/1.1",
 			ProtoMajor:    1,
 			ProtoMinor:    1,
+			Header:        Header{},
 			Close:         false,
 			ContentLength: 0,
 			Host:          "foo.com",
-			Form:          url.Values{},
 		},
 
 		noBody,
@@ -131,7 +130,6 @@ var reqTests = []reqTest{
 			Close:         false,
 			ContentLength: 0,
 			Host:          "test",
-			Form:          url.Values{},
 		},
 
 		noBody,
@@ -180,9 +178,9 @@ var reqTests = []reqTest{
 			Proto:            "HTTP/1.1",
 			ProtoMajor:       1,
 			ProtoMinor:       1,
+			Header:           Header{},
 			ContentLength:    -1,
 			Host:             "foo.com",
-			Form:             url.Values{},
 		},
 
 		"foobar",
diff --git a/src/pkg/net/http/response_test.go b/src/pkg/net/http/response_test.go
index 79dd8b8271..e5d01698e5 100644
--- a/src/pkg/net/http/response_test.go
+++ b/src/pkg/net/http/response_test.go
@@ -65,6 +65,7 @@ var respTests = []respTest{
 			Proto:         "HTTP/1.1",
 			ProtoMajor:    1,
 			ProtoMinor:    1,
+			Header:        Header{},
 			Request:       dummyReq("GET"),
 			Close:         true,
 			ContentLength: -1,
@@ -85,6 +86,7 @@ var respTests = []respTest{
 			Proto:         "HTTP/1.1",
 			ProtoMajor:    1,
 			ProtoMinor:    1,
+			Header:        Header{},
 			Request:       dummyReq("GET"),
 			Close:         false,
 			ContentLength: 0,