diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-02-23 15:59:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-23 15:59:26 +0100 |
| commit | 6c837fd51ea3c60c56adca4c9a2b7fa7f49f797f (patch) | |
| tree | ade8143c3087298974e5588363dfc566335ab08c | |
| parent | a88c1bdfb61d4c141d90e6864971f6d456417604 (diff) | |
| parent | 609e751667246eb4e2b5dd27305deab4bb03e5b6 (diff) | |
| download | nextcloud-server-6c837fd51ea3c60c56adca4c9a2b7fa7f49f797f.tar.gz nextcloud-server-6c837fd51ea3c60c56adca4c9a2b7fa7f49f797f.zip | |
Merge pull request #39607 from FedericoHeichou/fix-double-dots-with-pipe-sendmail
| -rw-r--r-- | apps/settings/templates/settings/admin/additional-mail.php | 2 | ||||
| -rw-r--r-- | lib/private/Mail/Mailer.php | 2 | ||||
| -rw-r--r-- | tests/lib/Mail/MailerTest.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings/templates/settings/admin/additional-mail.php b/apps/settings/templates/settings/admin/additional-mail.php index 3d418740963..14e0498cffe 100644 --- a/apps/settings/templates/settings/admin/additional-mail.php +++ b/apps/settings/templates/settings/admin/additional-mail.php @@ -45,7 +45,7 @@ if ($_['mail_smtpmode'] === 'qmail') { $mail_sendmailmode = [ 'smtp' => 'smtp (-bs)', - 'pipe' => 'pipe (-t)' + 'pipe' => 'pipe (-t -i)' ]; ?> diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index 9b7b3cf117b..61dc6f9214b 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -331,7 +331,7 @@ class Mailer implements IMailer { } $binaryParam = match ($this->config->getSystemValueString('mail_sendmailmode', 'smtp')) { - 'pipe' => ' -t', + 'pipe' => ' -t -i', default => ' -bs', }; diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php index 418bfe35c6e..0eee7db126a 100644 --- a/tests/lib/Mail/MailerTest.php +++ b/tests/lib/Mail/MailerTest.php @@ -72,7 +72,7 @@ class MailerTest extends TestCase { public function sendmailModeProvider(): array { return [ 'smtp' => ['smtp', ' -bs'], - 'pipe' => ['pipe', ' -t'], + 'pipe' => ['pipe', ' -t -i'], ]; } |