Imported Upstream version 58upstream/58

1 files changed, 4 insertions, 7 deletions

diff --git a/src/pkg/mime/multipart/formdata.go b/src/pkg/mime/multipart/formdata.go
index 287938557..5f3286565 100644
--- a/src/pkg/mime/multipart/formdata.go
+++ b/src/pkg/mime/multipart/formdata.go
@@ -30,21 +30,18 @@ func (r *multiReader) ReadForm(maxMemory int64) (f *Form, err os.Error) {
 	maxValueBytes := int64(10 << 20) // 10 MB is a lot of text.
 	for {
 		p, err := r.NextPart()
+		if err == os.EOF {
+			break
+		}
 		if err != nil {
 			return nil, err
 		}
-		if p == nil {
-			break
-		}
 
 		name := p.FormName()
 		if name == "" {
 			continue
 		}
-		var filename string
-		if p.dispositionParams != nil {
-			filename = p.dispositionParams["filename"]
-		}
+		filename := p.FileName()
 
 		var b bytes.Buffer