qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 20:14:52 -07:00
Code Releases Activity

net/textproto: fix build

Browse Source 
R=bradfitz
CC=golang-dev
https://golang.org/cl/4815041
This commit is contained in:
Russ Cox 2011-07-20 11:41:41 -04:00
parent 27a3dcd0d2
commit 971459e826
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pkg/mime/multipart/multipart_test.go
View File

@ -141,14 +141,14 @@ func testMultipart(t *testing.T, r io.Reader, onlyNewlines bool) {
t.Error("Expected part1")
return
}
if part.Header.Get("Header1") != "value1" {
t.Error("Expected Header1: value")
if x := part.Header.Get("Header1"); x != "value1" {
t.Errorf("part.Header.Get(%q) = %q, want %q", "Header1", x, "value1")
}
if part.Header.Get("foo-bar") != "baz" {
t.Error("Expected foo-bar: baz")
if x := part.Header.Get("foo-bar"); x != "baz" {
t.Errorf("part.Header.Get(%q) = %q, want %q", "foo-bar", x, "baz")
}
if part.Header.Get("Foo-Bar") != "baz" {
t.Error("Expected Foo-Bar: baz")
if x := part.Header.Get("Foo-Bar"); x != "baz" {
t.Errorf("part.Header.Get(%q) = %q, want %q", "Foo-Bar", x, "baz")
}
buf.Reset()
if _, err := io.Copy(buf, part); err != nil {

15
src/pkg/net/textproto/reader.go
View File

@ -115,6 +115,13 @@ func (r *Reader) readContinuedLineSlice() ([]byte, os.Error) {
}
line = trim(line)
copied := false
if r.R.Buffered() < 1 {
// ReadByte will flush the buffer; make a copy of the slice.
copied = true
line = append([]byte(nil), line...)
}
// Look for a continuation line.
c, err := r.R.ReadByte()
if err != nil {
@ -127,6 +134,11 @@ func (r *Reader) readContinuedLineSlice() ([]byte, os.Error) {
return line, nil
}
if !copied {
// The next readLineSlice will invalidate the previous one.
line = append(make([]byte, 0, len(line)*2), line...)
}
// Read continuation lines.
for {
// Consume leading spaces; one already gone.
@ -140,9 +152,6 @@ func (r *Reader) readContinuedLineSlice() ([]byte, os.Error) {
break
}
}
// copy now since the next call to read a slice invalidates line
line = append(make([]byte, 0, len(line)*2), line...)
var cont []byte
cont, err = r.readLineSlice()
cont = trim(cont)