2 files changed, 8 insertions, 7 deletions
diff --git a/libgo/go/net/textproto/pipeline.go b/libgo/go/net/textproto/pipeline.go
index 2e28321..1928a30 100644
--- a/libgo/go/net/textproto/pipeline.go
+++ b/libgo/go/net/textproto/pipeline.go
@@ -72,7 +72,7 @@ func (p *Pipeline) EndResponse(id uint) {
 type sequencer struct {
 	mu   sync.Mutex
 	id   uint
-	wait map[uint]chan uint
+	wait map[uint]chan struct{}
 }
 
 // Start waits until it is time for the event numbered id to begin.
@@ -84,9 +84,9 @@ func (s *sequencer) Start(id uint) {
 		s.mu.Unlock()
 		return
 	}
-	c := make(chan uint)
+	c := make(chan struct{})
 	if s.wait == nil {
-		s.wait = make(map[uint]chan uint)
+		s.wait = make(map[uint]chan struct{})
 	}
 	s.wait[id] = c
 	s.mu.Unlock()
@@ -99,12 +99,13 @@ func (s *sequencer) Start(id uint) {
 func (s *sequencer) End(id uint) {
 	s.mu.Lock()
 	if s.id != id {
+		s.mu.Unlock()
 		panic("out of sync")
 	}
 	id++
 	s.id = id
 	if s.wait == nil {
-		s.wait = make(map[uint]chan uint)
+		s.wait = make(map[uint]chan struct{})
 	}
 	c, ok := s.wait[id]
 	if ok {
@@ -112,6 +113,6 @@ func (s *sequencer) End(id uint) {
 	}
 	s.mu.Unlock()
 	if ok {
-		c <- 1
+		close(c)
 	}
 }
diff --git a/libgo/go/net/textproto/reader.go b/libgo/go/net/textproto/reader.go
index a505da9..a00fd23 100644
--- a/libgo/go/net/textproto/reader.go
+++ b/libgo/go/net/textproto/reader.go
@@ -88,7 +88,7 @@ func (r *Reader) readLineSlice() ([]byte, error) {
 // The first call to ReadContinuedLine will return "Line 1 continued..."
 // and the second will return "Line 2".
 //
-// A line consisting of only white space is never continued.
+// Empty lines are never continued.
 //
 func (r *Reader) ReadContinuedLine() (string, error) {
 	line, err := r.readContinuedLineSlice(noValidation)
@@ -557,7 +557,7 @@ func noValidation(_ []byte) error { return nil }
 // contain a colon.
 func mustHaveFieldNameColon(line []byte) error {
 	if bytes.IndexByte(line, ':') < 0 {
-		return ProtocolError(fmt.Sprintf("malformed MIME header: missing colon: %q" + string(line)))
+		return ProtocolError(fmt.Sprintf("malformed MIME header: missing colon: %q", line))
 	}
 	return nil
 }