Use crlf in mail headers #15807
Merged
Use crlf in mail headers #15807
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Separate mail headers with \r\n to be compliant with RFC specs. This also fixes delivery issues in PHP 8. The content is also wrapped with CRLF for consistency. Testing this with a variety mail transfer agents is not something I'm able to do at this time. Refs #15803
othercorey
reviewed
Sep 1, 2021
| @@ -41,7 +41,7 @@ public function send(Message $message): array | |||
| $to = $message->getHeaders(['to'])['To']; | |||
| $to = str_replace("\r\n", '', $to); | |||
|
|
|||
| $eol = $this->getConfig('eol', PHP_EOL); | |||
| $eol = $this->getConfig('eol', "\r\n"); | |||
There was a problem hiding this comment.
The php bug listed above was fixed in php8. https://bugs.php.net/bug.php?id=47983
There was a problem hiding this comment.
I'm hoping that MTAs are ok with CRLF in headers. The other option would be to change the default based on the PHP version.
There was a problem hiding this comment.
It's the standard and if php 8 is doing it then we're as compatible as php is.
There was a problem hiding this comment.
I wonder if php 7.4 will throw errors because PHP uses \n while cakephp uses \r\n. We might need version-specific default?
Would be nice to test that at least.
There was a problem hiding this comment.
Yeah, using \n for PHP7 would make this a safer change.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Separate mail headers with \r\n to be compliant with RFC specs. This also fixes delivery issues in PHP 8. The content is also wrapped with CRLF for consistency. Testing this with a variety mail transfer agents is not something I'm able to do at this time.
Refs #15803