From 2babb1a0f17bb704c8fcc41443e395d84a9042eb Mon Sep 17 00:00:00 2001 From: FedericoHeichou Date: Fri, 28 Jul 2023 09:34:16 +0200 Subject: [PATCH 1/2] Add "-i" to sendmail's pipe Signed-off-by: FedericoHeichou --- apps/settings/templates/settings/admin/additional-mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/settings/templates/settings/admin/additional-mail.php b/apps/settings/templates/settings/admin/additional-mail.php index c6548d88737b0..4e81e52c83bb2 100644 --- a/apps/settings/templates/settings/admin/additional-mail.php +++ b/apps/settings/templates/settings/admin/additional-mail.php @@ -45,7 +45,7 @@ $mail_sendmailmode = [ 'smtp' => 'smtp (-bs)', - 'pipe' => 'pipe (-t)' + 'pipe' => 'pipe (-t -i)' ]; ?> From ee45bfa955444f1e6021ee089b6ca429341b0df2 Mon Sep 17 00:00:00 2001 From: FedericoHeichou Date: Fri, 28 Jul 2023 14:46:23 +0200 Subject: [PATCH 2/2] Add "-i" to MailTest's pipe Signed-off-by: FedericoHeichou [skip ci] --- tests/lib/Mail/MailerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php index a93086a201fdd..71e14e072804e 100644 --- a/tests/lib/Mail/MailerTest.php +++ b/tests/lib/Mail/MailerTest.php @@ -72,7 +72,7 @@ protected function setUp(): void { public function sendmailModeProvider(): array { return [ 'smtp' => ['smtp', ' -bs'], - 'pipe' => ['pipe', ' -t'], + 'pipe' => ['pipe', ' -t -i'], ]; }