mirror of
https://github.com/go-gitea/gitea
synced 2024-12-24 09:34:26 +00:00
Merge pull request #973 from uchti/dev
Fix: 504 5.5.2 <localhost>: Helo command rejected
This commit is contained in:
commit
065f8d1f56
@ -10,6 +10,7 @@ import (
|
||||
"net"
|
||||
"net/mail"
|
||||
"net/smtp"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/gogits/gogs/modules/log"
|
||||
@ -95,6 +96,15 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte)
|
||||
return err
|
||||
}
|
||||
|
||||
hostname, err := os.Hostname()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err = client.Hello(hostname); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// If not using SMTPS, alway use STARTTLS if available
|
||||
hasStartTLS, _ := client.Extension("STARTTLS")
|
||||
if !isSecureConn && hasStartTLS {
|
||||
|
Loading…
Reference in New Issue
Block a user