From d80588d99511fac16495f8eaafa50e01a6b98995 Mon Sep 17 00:00:00 2001
From: guriguri <guriguri.kr@gmail.com>
Date: Wed, 31 Jul 2013 11:20:49 -0400
Subject: [PATCH] apply PageParameters(final Map<String, ?> parameterMap), encode filename of Content-Disposition
---
src/main/java/com/gitblit/MailExecutor.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/MailExecutor.java b/src/main/java/com/gitblit/MailExecutor.java
index 54ff8b8..c4e776a 100644
--- a/src/main/java/com/gitblit/MailExecutor.java
+++ b/src/main/java/com/gitblit/MailExecutor.java
@@ -60,6 +60,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);
boolean authenticate = !StringUtils.isEmpty(mailUser) && !StringUtils.isEmpty(mailPassword);
String server = settings.getString(Keys.mail.server, "");
if (StringUtils.isEmpty(server)) {
@@ -79,7 +80,7 @@
props.setProperty("mail.smtp.auth", String.valueOf(authenticate));
props.setProperty("mail.smtp.auths", String.valueOf(authenticate));
- if (isGMail) {
+ if (isGMail || smtps) {
props.setProperty("mail.smtp.starttls.enable", "true");
props.put("mail.smtp.socketFactory.port", String.valueOf(port));
props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
--
Gitblit v1.9.1