wneessen/go-mail
1
1
Fork 0
mirror of https://github.com/wneessen/go-mail.git synced 2024-11-22 13:50:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

v0.1.6b: writeHeader() was producing double spaces at line breaks

Browse source
This commit is contained in:
Winni Neessen 2022-03-20 18:18:06 +01:00
parent b852a5281a
commit d448f0566b
Signed by: wneessen
GPG key ID: 5F3AF39B820C119D
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
msgwriter.go
View file

@ -199,31 +199,35 @@ func (mw *msgWriter) writeString(s string) {
// writeHeader writes a header into the msgWriter's io.Writer // writeHeader writes a header into the msgWriter's io.Writer
func (mw *msgWriter) writeHeader(k Header, vl ...string) { func (mw *msgWriter) writeHeader(k Header, vl ...string) {
// Chars left: MaxHeaderLength - "<Headername>: " - "CRLF" wbuf := bytes.Buffer{}
cl := MaxHeaderLength - 2 cl := MaxHeaderLength - 2
mw.writeString(string(k)) wbuf.WriteString(string(k))
cl -= len(k) cl -= len(k)
if len(vl) == 0 { if len(vl) == 0 {
mw.writeString(":\r\n") wbuf.WriteString(":\r\n")
return return
} }
mw.writeString(": ") wbuf.WriteString(": ")
cl -= 2 cl -= 2
fs := strings.Join(vl, ", ") fs := strings.Join(vl, ", ")
sfs := strings.Split(fs, " ") sfs := strings.Split(fs, " ")
for i, v := range sfs { for i, v := range sfs {
if cl-len(v) <= 1 { if cl-len(v) <= 1 {
mw.writeString("\r\n ") wbuf.WriteString("\r\n ")
cl = MaxHeaderLength - 3 cl = MaxHeaderLength - 3
} }
mw.writeString(v) wbuf.WriteString(v)
if i < len(sfs) { if i < len(sfs)-1 {
mw.writeString(" ") wbuf.WriteString(" ")
cl -= 1 cl -= 1
} }
cl -= len(v) cl -= len(v)
} }
bufs := wbuf.String()
bufs = strings.ReplaceAll(bufs, " \r\n", "\r\n")
mw.writeString(bufs)
mw.writeString("\r\n") mw.writeString("\r\n")
} }