aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2011-08-18 11:01:43 +1000
committerRob Pike <r@golang.org>2011-08-18 11:01:43 +1000
commit8380ff34edc2e8e84fff3a5933e19c4335052731 (patch)
treeb03d49d8087ebf8af055ef400be1e4df17db01b0
parente4a89d7ccaa4e5d3ccd6552cc2d8e108fe0bcd9a (diff)
downloadgo-8380ff34edc2e8e84fff3a5933e19c4335052731.tar.gz
go-8380ff34edc2e8e84fff3a5933e19c4335052731.zip
http: remove a TODO due to new behavior of nil maps
R=golang-dev, dsymonds, adg CC=golang-dev https://golang.org/cl/4907049
-rw-r--r--src/pkg/http/request.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pkg/http/request.go b/src/pkg/http/request.go
index 9126920810..ed41fa45c1 100644
--- a/src/pkg/http/request.go
+++ b/src/pkg/http/request.go
@@ -619,8 +619,6 @@ func (r *Request) ParseForm() (err os.Error) {
if r.URL != nil {
r.Form, err = url.ParseQuery(r.URL.RawQuery)
- } else {
- r.Form = make(url.Values) // TODO: remove when nil maps work.
}
if r.Method == "POST" {
if r.Body == nil {
@@ -645,6 +643,9 @@ func (r *Request) ParseForm() (err os.Error) {
if err == nil {
err = e
}
+ if r.Form == nil {
+ r.Form = make(url.Values)
+ }
// Copy values into r.Form. TODO: make this smoother.
for k, vs := range newValues {
for _, value := range vs {