diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-12-18 07:53:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 07:53:45 +0100 |
| commit | 6f994be665b876c35fa73d4672e81264c43efe8d (patch) | |
| tree | b92e4a41e9d783960398a598f734badc7c76f647 /lib/private | |
| parent | f36082838e3f9686a79a105974ba42b311ad5c92 (diff) | |
| parent | 7cef9b0248d5d2e026f4d74668e36c3642796e8e (diff) | |
| download | nextcloud-server-6f994be665b876c35fa73d4672e81264c43efe8d.tar.gz nextcloud-server-6f994be665b876c35fa73d4672e81264c43efe8d.zip | |
Merge pull request #12766 from stalker314314/streaming-options
Expose Swift Mailer streaming options in config, fixes #12702
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Mail/Mailer.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index 7a8b4ad2599..d103e1380c5 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', []); + if (is_array($streamingOptions) && !empty($streamingOptions)) { + $transport->setStreamOptions($streamingOptions); + } return $transport; } |