mime: fix build

The fix is to add ' ' after ';' so that we match
what we used to generate.
Packages like http look for the string with
the space in it, and I don't see a reason to
be so terse.

Also s/buffer/b/

TBR=bradfitz
CC=golang-dev
https://golang.org/cl/4959044

diff --git a/src/pkg/mime/mediatype.go b/src/pkg/mime/mediatype.go
index 35cac1345839e7519b8d87b93986099d941021d7..b0d39338170212ff7b690ea197f0b590caa43131 100644 (file)
--- a/src/pkg/mime/mediatype.go
+++ b/src/pkg/mime/mediatype.go
@@ -21,39 +21,40 @@ func FormatMediaType(t, sub string, param map[string]string) string {
        if !(IsToken(t) && IsToken(sub)) {
                return ""
        }
-       var buffer bytes.Buffer
-       buffer.WriteString(strings.ToLower(t))
-       buffer.WriteByte('/')
-       buffer.WriteString(strings.ToLower(sub))
+       var b bytes.Buffer
+       b.WriteString(strings.ToLower(t))
+       b.WriteByte('/')
+       b.WriteString(strings.ToLower(sub))
 
        for attribute, value := range param {
-               buffer.WriteByte(';')
+               b.WriteByte(';')
+               b.WriteByte(' ')
                if !IsToken(attribute) {
                        return ""
                }
-               buffer.WriteString(strings.ToLower(attribute))
-               buffer.WriteByte('=')
+               b.WriteString(strings.ToLower(attribute))
+               b.WriteByte('=')
                if IsToken(value) {
-                       buffer.WriteString(value)
+                       b.WriteString(value)
                        continue
                }
 
-               buffer.WriteByte('"')
+               b.WriteByte('"')
                offset := 0
                for index, character := range value {
                        if character == '"' || character == '\r' {
-                               buffer.WriteString(value[offset:index])
+                               b.WriteString(value[offset:index])
                                offset = index
-                               buffer.WriteByte('\\')
+                               b.WriteByte('\\')
                        }
                        if character&0x80 != 0 {
                                return ""
                        }
                }
-               buffer.WriteString(value[offset:])
-               buffer.WriteByte('"')
+               b.WriteString(value[offset:])
+               b.WriteByte('"')
        }
-       return buffer.String()
+       return b.String()
 }
 
 func checkMediaTypeDisposition(s string) os.Error {

diff --git a/src/pkg/mime/type.go b/src/pkg/mime/type.go
index deb0ff6d916bff0cc35a20e5675ce9545b024c5e..39bf40ee89aa99e16f2e3e1c0a8d3f9e8e6589bd 100644 (file)
--- a/src/pkg/mime/type.go
+++ b/src/pkg/mime/type.go
@@ -20,15 +20,15 @@ var typeFiles = []string{
 }
 
 var mimeTypes = map[string]string{
-       ".css":  "text/css;charset=utf-8",
+       ".css":  "text/css; charset=utf-8",
        ".gif":  "image/gif",
-       ".htm":  "text/html;charset=utf-8",
-       ".html": "text/html;charset=utf-8",
+       ".htm":  "text/html; charset=utf-8",
+       ".html": "text/html; charset=utf-8",
        ".jpg":  "image/jpeg",
        ".js":   "application/x-javascript",
        ".pdf":  "application/pdf",
        ".png":  "image/png",
-       ".xml":  "text/xml;charset=utf-8",
+       ".xml":  "text/xml; charset=utf-8",
 }
 
 var mimeLock sync.RWMutex

diff --git a/src/pkg/mime/type_test.go b/src/pkg/mime/type_test.go
index 2af39c7bb8066eec0d97eb60856f7b747db7abbd..976f85343099d6df209b6100ab52017200843455 100644 (file)
--- a/src/pkg/mime/type_test.go
+++ b/src/pkg/mime/type_test.go
@@ -8,7 +8,7 @@ import "testing"
 
 var typeTests = map[string]string{
        ".t1":  "application/test",
-       ".t2":  "text/test;charset=utf-8",
+       ".t2":  "text/test; charset=utf-8",
        ".png": "image/png",
 }
 
@@ -25,7 +25,7 @@ func TestTypeByExtension(t *testing.T) {
 }
 
 func TestCustomExtension(t *testing.T) {
-       custom := "text/xml;charset=iso-8859-1"
+       custom := "text/xml; charset=iso-8859-1"
        if error := AddExtensionType(".xml", custom); error != nil {
                t.Fatalf("error %s for AddExtension(%s)", error, custom)
        }