Merge branch 'master' of github.com:0xc0d/go

0xc0d · 0xc0d · commit 631d6584b823 · 2021-08-23T02:14:53.000+02:00
# Conflicts:
#	src/net/mail/message.go
diff --git a/src/net/mail/message.go b/src/net/mail/message.go
@@ -54,7 +54,7 @@ func ReadMessage(r io.Reader) (msg *Message, err error) {
 	tp := textproto.NewReader(bufio.NewReader(r))
 
 	hdr, err := tp.ReadMIMEHeader()
-	if err != nil && (err != io.EOF || len(hdr) == 0) {
+	if err != nil && (err == io.EOF || len(hdr) == 0) {
 		return nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func ReadMessage(r io.Reader) (msg *Message, err error) {`
`54`	`54`	`tp := textproto.NewReader(bufio.NewReader(r))`
`55`	`55`
`56`	`56`	`hdr, err := tp.ReadMIMEHeader()`
`57`		`- if err != nil && (err != io.EOF \|\| len(hdr) == 0) {`
	`57`	`+ if err != nil && (err == io.EOF \|\| len(hdr) == 0) {`
`58`	`58`	`return nil, err`
`59`	`59`	`}`
`60`	`60`