mirror of
https://github.com/mjl-/mox.git
synced 2025-07-12 13:04:38 +03:00
improve message parsing: allow bare carriage return (unless in pedantic mode), allow empty header, and no longer treat a message with only headers as a message with only a body
This commit is contained in:
@ -2683,7 +2683,7 @@ func (c *conn) cmdAppend(tag, cmd string, p *parser) {
|
||||
}
|
||||
}()
|
||||
defer c.xtrace(mlog.LevelTracedata)()
|
||||
mw := &message.Writer{Writer: msgFile}
|
||||
mw := message.NewWriter(msgFile)
|
||||
msize, err := io.Copy(mw, io.LimitReader(c.br, size))
|
||||
c.xtrace(mlog.LevelTrace) // Restore.
|
||||
if err != nil {
|
||||
@ -2693,11 +2693,6 @@ func (c *conn) cmdAppend(tag, cmd string, p *parser) {
|
||||
if msize != size {
|
||||
xserverErrorf("read %d bytes for message, expected %d (%w)", msize, size, errIO)
|
||||
}
|
||||
msgPrefix := []byte{}
|
||||
// todo: should we treat the message as body? i believe headers are required in messages, and bodies are optional. so would make more sense to treat the data as headers. perhaps only if the headers are valid?
|
||||
if !mw.HaveHeaders {
|
||||
msgPrefix = []byte("\r\n")
|
||||
}
|
||||
|
||||
if utf8 {
|
||||
line := c.readline(false)
|
||||
@ -2736,8 +2731,7 @@ func (c *conn) cmdAppend(tag, cmd string, p *parser) {
|
||||
Received: tm,
|
||||
Flags: storeFlags,
|
||||
Keywords: keywords,
|
||||
Size: size + int64(len(msgPrefix)),
|
||||
MsgPrefix: msgPrefix,
|
||||
Size: size,
|
||||
}
|
||||
|
||||
mb.Add(m.MailboxCounts())
|
||||
|
Reference in New Issue
Block a user