[web-bugs] master: Fixed line endings for setting headers

Author: Derick Rethans (derickr) Date: 2023-11-20T12:43:16Z Commit: https://github.com/php/web-bugs/commit/9ed00f752fb1f82a93ed08a13f45219e5723c0d0 Raw diff: https://github.com/php/web-bugs/commit/9ed00f752fb1f82a93ed08a13f45219e5723c0d0.diff Fixed line endings for setting headers During the recent server upgrades, it seems that the MTA does no longer 'convert' this. In fact, this has always been wrong. Changed paths: M include/functions.php Diff: diff --git a/include/functions.php b/include/functions.php index cc072839..f03ddb04 100644 --- a/include/functions.php +++ b/include/functions.php @@ -968,10 +968,10 @@ function mail_bug_updates($bug, $in, $from, $ncomment, $edit = 1, $id = false) $bug['email'], "{$subj}: {$sdesc}", $user_text, - "From: {$siteBig} Bug Database <{$mailfrom}>\n" . - "Bcc: {$bcc}\n" . - "X-PHP-Bug: {$bug['id']}\n" . - "X-PHP-Site: {$siteBig}\n" . + "From: {$siteBig} Bug Database <{$mailfrom}>\r\n" . + "Bcc: {$bcc}\r\n" . + "X-PHP-Bug: {$bug['id']}\r\n" . + "X-PHP-Site: {$siteBig}\r\n" . "In-Reply-To: <bug-{$bug['id']}@{$site_url}>" ); @@ -988,15 +988,15 @@ function mail_bug_updates($bug, $in, $from, $ncomment, $edit = 1, $id = false) $mailto, "{$subj}: {$sdesc}", $dev_text, - "From: {$from}\n". - "X-PHP-Bug: {$bug['id']}\n" . - "X-PHP-Site: {$siteBig}\n" . - "X-PHP-Type: {$tmp['bug_type']}\n" . - "X-PHP-Version: {$tmp['php_version']}\n" . - "X-PHP-Category: {$tmp['package_name']}\n" . - "X-PHP-OS: {$tmp['php_os']}\n" . - "X-PHP-Status: {$tmp['new_status']}\n" . - "X-PHP-Old-Status: {$tmp['old_status']}\n" . + "From: {$from}\r\n". + "X-PHP-Bug: {$bug['id']}\r\n" . + "X-PHP-Site: {$siteBig}\r\n" . + "X-PHP-Type: {$tmp['bug_type']}\r\n" . + "X-PHP-Version: {$tmp['php_version']}\r\n" . + "X-PHP-Category: {$tmp['package_name']}\r\n" . + "X-PHP-OS: {$tmp['php_os']}\r\n" . + "X-PHP-Status: {$tmp['new_status']}\r\n" . + "X-PHP-Old-Status: {$tmp['old_status']}\r\n" . "In-Reply-To: <bug-{$bug['id']}@{$site_url}>", $params ); @@ -1016,8 +1016,8 @@ function mail_bug_updates($bug, $in, $from, $ncomment, $edit = 1, $id = false) $email, $bug_types[$bug['bug_type']] . ' #' . $bug['id'] . ' ' . txfield('sdesc', $bug, $in), "{$in['assign']} you have just been assigned to this bug by {$from}\n\n{$dev_text}", - "From: {$from}\n" . - "X-PHP-Bug: {$bug['id']}\n" . + "From: {$from}\r\n" . + "X-PHP-Bug: {$bug['id']}\r\n" . "In-Reply-To: <bug-{$bug['id']}@{$site_url}>" ); } @@ -1393,8 +1393,8 @@ function unsubscribe_hash($bug_id, $email) $email, "[$siteBig-BUG-unsubscribe] #{$bug_id}", $user_text, - "From: {$siteBig} Bug Database <{$bugEmail}>\n". - "X-PHP-Bug: {$bug_id}\n". + "From: {$siteBig} Bug Database <{$bugEmail}>\r\n". + "X-PHP-Bug: {$bug_id}\r\n". "In-Reply-To: <bug-{$bug_id}@{$site_url}>" ); }