http: remove a TODO due to new behavior of nil maps

R=golang-dev, dsymonds, adg
CC=golang-dev
https://golang.org/cl/4907049

diff --git a/src/pkg/http/request.go b/src/pkg/http/request.go
index 9126920810372203b96ee55428720849042b2a95..ed41fa45c134b2084d4087e752b253325f5f7eae 100644 (file)
--- 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 {