Merge branch 'master' of https://github.com/gogits/gogs

Conflicts:
	routers/repo/download.go

1 files changed, 11 insertions, 6 deletions

diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go
index 74a3fca5..9dafa93f 100644
--- a/modules/mailer/mailer.go
+++ b/modules/mailer/mailer.go
@@ -104,13 +104,18 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte)
 		return err
 	}
 
-	hostname, err := os.Hostname()
-	if err != nil {
-		return err
-	}
+	if !setting.MailService.DisableHelo {
+		hostname := setting.MailService.HeloHostname
+		if len(hostname) == 0 {
+			hostname, err = os.Hostname()
+			if err != nil {
+				return err
+			}
+		}
 
-	if err = client.Hello(hostname); err != nil {
-		return err
+		if err = client.Hello(hostname); err != nil {
+			return err
+		}
 	}
 
 	// If not using SMTPS, alway use STARTTLS if available