tyler.durden
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #973 from uchti/dev 

Fix: 504 5.5.2 <localhost>: Helo command rejected
This commit is contained in:
无闻 2015-02-20 18:25:18 -05:00
parent 8f1d2d9f24 2f1369c614
commit 065f8d1f56
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/mailer/mailer.go
View File

@ -10,6 +10,7 @@ import (
"net" "net"
"net/mail" "net/mail"
"net/smtp" "net/smtp"
"os"
"strings" "strings"
"github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/log"
@ -95,6 +96,15 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte)
return err 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 // If not using SMTPS, alway use STARTTLS if available
hasStartTLS, _ := client.Extension("STARTTLS") hasStartTLS, _ := client.Extension("STARTTLS")
if !isSecureConn && hasStartTLS { if !isSecureConn && hasStartTLS {