From 42722d906ebd10e36ea4e1afeba01fc0711ccb7f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 07 Oct 2014 08:15:43 -0400
Subject: [PATCH] Merged #203 "Bug in the rawservlet in extracting the repository out of the path"
---
src/main/java/com/gitblit/service/MailService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/service/MailService.java b/src/main/java/com/gitblit/service/MailService.java
index 4759d17..ae9727f 100644
--- a/src/main/java/com/gitblit/service/MailService.java
+++ b/src/main/java/com/gitblit/service/MailService.java
@@ -68,6 +68,7 @@
final String mailUser = settings.getString(Keys.mail.username, null);
final String mailPassword = settings.getString(Keys.mail.password, null);
final boolean smtps = settings.getBoolean(Keys.mail.smtps, false);
+ final boolean starttls = settings.getBoolean(Keys.mail.starttls, false);
boolean authenticate = !StringUtils.isEmpty(mailUser) && !StringUtils.isEmpty(mailPassword);
String server = settings.getString(Keys.mail.server, "");
if (StringUtils.isEmpty(server)) {
@@ -86,6 +87,7 @@
props.setProperty("mail.smtp.port", String.valueOf(port));
props.setProperty("mail.smtp.auth", String.valueOf(authenticate));
props.setProperty("mail.smtp.auths", String.valueOf(authenticate));
+ props.setProperty("mail.smtp.starttls.enable", String.valueOf(starttls));
if (isGMail || smtps) {
props.setProperty("mail.smtp.starttls.enable", "true");
--
Gitblit v1.9.1