summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBranko Kokanovic <branko@kokanovic.org>2018-11-30 21:06:44 +0100
committerBranko Kokanovic <branko@kokanovic.org>2018-11-30 22:36:03 +0100
commit72d97b44a752dc850f35c5ba830ae49bf3471815 (patch)
treeb5ec24fa2c5c517b99024f1b98bc3eedf3ca66f7 /lib
parentcae600d205572d38f6215e5e250f9bf5d89e64ff (diff)
downloadnextcloud-server-72d97b44a752dc850f35c5ba830ae49bf3471815.tar.gz
nextcloud-server-72d97b44a752dc850f35c5ba830ae49bf3471815.zip
Expose Swift Mailer streaming options in config, fixes #12702
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Mail/Mailer.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php
index 7a8b4ad2599..2dad72b5b12 100644
--- a/lib/private/Mail/Mailer.php
+++ b/lib/private/Mail/Mailer.php
@@ -259,6 +259,10 @@ class Mailer implements IMailer {
if (!empty($smtpSecurity)) {
$transport->setEncryption($smtpSecurity);
}
+ $streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', array());
+ if (is_array($streamingOptions) && count($streamingOptions) > 0) {
+ $transport->setStreamOptions($streamingOptions);
+ }
return $transport;
}