Imported Upstream version 58upstream/58

1 files changed, 28 insertions, 16 deletions

diff --git a/src/pkg/mime/multipart/multipart.go b/src/pkg/mime/multipart/multipart.go
index 60329fe17..9affa1126 100644
--- a/src/pkg/mime/multipart/multipart.go
+++ b/src/pkg/mime/multipart/multipart.go
@@ -26,14 +26,14 @@ import (
 
 var headerRegexp *regexp.Regexp = regexp.MustCompile("^([a-zA-Z0-9\\-]+): *([^\r\n]+)")
 
+var emptyParams = make(map[string]string)
+
 // Reader is an iterator over parts in a MIME multipart body.
 // Reader's underlying parser consumes its input as needed.  Seeking
 // isn't supported.
 type Reader interface {
-	// NextPart returns the next part in the multipart, or (nil,
-	// nil) on EOF.  An error is returned if the underlying reader
-	// reports errors, or on truncated or otherwise malformed
-	// input.
+	// NextPart returns the next part in the multipart or an error.
+	// When there are no more parts, the error os.EOF is returned.
 	NextPart() (*Part, os.Error)
 
 	// ReadForm parses an entire multipart message whose parts have
@@ -53,6 +53,7 @@ type Part struct {
 	buffer *bytes.Buffer
 	mr     *multiReader
 
+	disposition       string
 	dispositionParams map[string]string
 }
 
@@ -61,21 +62,33 @@ type Part struct {
 func (p *Part) FormName() string {
 	// See http://tools.ietf.org/html/rfc2183 section 2 for EBNF
 	// of Content-Disposition value format.
-	if p.dispositionParams != nil {
-		return p.dispositionParams["name"]
-	}
-	v := p.Header.Get("Content-Disposition")
-	if v == "" {
-		return ""
+	if p.dispositionParams == nil {
+		p.parseContentDisposition()
 	}
-	if d, params := mime.ParseMediaType(v); d != "form-data" {
+	if p.disposition != "form-data" {
 		return ""
-	} else {
-		p.dispositionParams = params
 	}
 	return p.dispositionParams["name"]
 }
 
+
+// FileName returns the filename parameter of the Part's
+// Content-Disposition header.
+func (p *Part) FileName() string {
+	if p.dispositionParams == nil {
+		p.parseContentDisposition()
+	}
+	return p.dispositionParams["filename"]
+}
+
+func (p *Part) parseContentDisposition() {
+	v := p.Header.Get("Content-Disposition")
+	p.disposition, p.dispositionParams = mime.ParseMediaType(v)
+	if p.dispositionParams == nil {
+		p.dispositionParams = emptyParams
+	}
+}
+
 // NewReader creates a new multipart Reader reading from r using the
 // given MIME boundary.
 func NewReader(reader io.Reader, boundary string) Reader {
@@ -207,9 +220,8 @@ func (mr *multiReader) NextPart() (*Part, os.Error) {
 		}
 
 		if hasPrefixThenNewline(line, mr.dashBoundaryDash) {
-			// Expected EOF (no error)
-			// TODO(bradfitz): should return an os.EOF error here, not using nil for errors
-			return nil, nil
+			// Expected EOF
+			return nil, os.EOF
 		}
 
 		if expectNewPart {