Merge pull request #43788 from nextcloud/backport/39607/stable28

skjnldsv · web-flow · commit 6a268218fc8d · 2024-02-29T11:30:23.000+01:00
diff --git 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)'
 ];
 
 ?>
diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php
@@ -331,7 +331,7 @@ protected function getSendMailInstance(): SendmailTransport {
 		}
 
 		$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
@@ -72,7 +72,7 @@ protected function setUp(): void {
 	public function sendmailModeProvider(): array {
 		return [
 			'smtp' => ['smtp', ' -bs'],
-			'pipe' => ['pipe', ' -t'],
+			'pipe' => ['pipe', ' -t -i'],
 		];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ protected function getSendMailInstance(): SendmailTransport {`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`$binaryParam = match ($this->config->getSystemValueString('mail_sendmailmode', 'smtp')) {`
`334`		`- 'pipe' => ' -t',`
	`334`	`+ 'pipe' => ' -t -i',`
`335`	`335`	`default => ' -bs',`
`336`	`336`	`};`
`337`	`337`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected function setUp(): void {`
`72`	`72`	`public function sendmailModeProvider(): array {`
`73`	`73`	`return [`
`74`	`74`	`'smtp' => ['smtp', ' -bs'],`
`75`		`- 'pipe' => ['pipe', ' -t'],`
	`75`	`+ 'pipe' => ['pipe', ' -t -i'],`
`76`	`76`	`];`
`77`	`77`	`}`
`78`	`78`