mirror/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #430 from xiecang/bugfix/send_smtp_mail

Browse Source 
fix: ignore error "starttls command has been already sent"
This commit is contained in:
Ferdinand Mütsch 2022-11-17 08:31:24 +01:00 committed by GitHub
commit b1a12a5759
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
services/mail/smtp.go
View File

@ -42,7 +42,12 @@ func (s *SMTPSendingService) Send(mail *models.Mail) error {
if ok, _ := c.Extension("STARTTLS"); ok { if ok, _ := c.Extension("STARTTLS"); ok {
if err = c.StartTLS(nil); err != nil { if err = c.StartTLS(nil); err != nil {
return err errCode := err.(*smtp.SMTPError).Code
if errCode == 503 {
// TLS already active
} else {
return err
}
} }
} }
if s.auth != nil { if s.auth != nil {