Merge pull request #39607 from FedericoHeichou/fix-double-dots-with-pipe-sendmail

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)'
 ];
 
 ?>

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',
 		};
 

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'],
 		];
 	}