Skip to content

Fix bug 3071 #3075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kreshot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug 3071 #3075

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions internal/bounce/mailbox/pop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ func (p *POP) Scan(limit int, ch chan models.Bounce) error {
}

// Download messages.
MESSAGES_LOOP:
for id := 1; id <= count; id++ {
// Retrieve the raw bytes of the message.
b, err := c.RetrRaw(id)
Expand All @@ -123,16 +124,24 @@ func (p *POP) Scan(limit int, ch chan models.Bounce) error {

h := m

// If this is a multipart message, find the last part.
// If this is a multipart message, prefer the text/plain part, otherwise use the last part.
if mr := m.MultipartReader(); mr != nil {
for {
part, err := mr.NextPart()
if err == io.EOF {
break
} else if err != nil {
if err == nil {
if strings.HasPrefix(strings.ToLower(part.Header.Get("Content-Type")), "text/plain") {
h = part
break
}
} else {
if err == io.EOF {
break
}

p.lo.Printf("error reading multipart bounce message %d: %v", id, err)
continue
continue MESSAGES_LOOP
}

h = part
}
}
Expand Down