Skip to content

[stable28] Add "-i" to sendmail's pipe #43788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 2 commits into from
Feb 29, 2024
Merged

[stable28] Add "-i" to sendmail's pipe #43788

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39d81af
Add "-i" to sendmail's pipe
FedericoHeichou Jul 28, 2023
354f895
Add "-i" to MailTest's pipe
FedericoHeichou Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add "-i" to sendmail's pipe 
Signed-off-by: FedericoHeichou <[email protected]>
  • Loading branch information
@FedericoHeichou @backportbot
FedericoHeichou authored and backportbot[bot] committed Feb 23, 2024
commit 39d81aff8f8961d50b8af5b830d999654ff40113
2 changes: 1 addition & 1 deletion apps/settings/templates/settings/admin/additional-mail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

$mail_sendmailmode = [
'smtp' => 'smtp (-bs)',
'pipe' => 'pipe (-t)'
'pipe' => 'pipe (-t -i)'
];

?>
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Mail/Mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ protected function getSendMailInstance(): SendmailTransport {
}

$binaryParam = match ($this->config->getSystemValueString('mail_sendmailmode', 'smtp')) {
'pipe' => ' -t',
'pipe' => ' -t -i',
default => ' -bs',
};

Expand Down