-
Notifications
You must be signed in to change notification settings - Fork 7.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix GH-8086: Introduce mail.mixed_lf_and_crlf INI
When this INI option is enabled, it reverts the line separator for headers and message to LF which was a non conformant behavior in PHP 7. It is done because some non conformant MTAs fail to parse CRLF line separator for headers and body. This is used for mail and mb_send_mail functions.
- Loading branch information
Showing
10 changed files
with
83 additions
and
11 deletions.
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
--TEST-- | ||
GH-8086 (mb_send_mail() function not working correctly in PHP 8.x) | ||
--SKIPIF-- | ||
<?php | ||
if (!extension_loaded("mbstring")) die("skip mbstring extension not available"); | ||
?> | ||
--INI-- | ||
sendmail_path={MAIL:{PWD}/gh8086.eml} | ||
mail.mixed_lf_and_crlf=on | ||
--FILE-- | ||
<?php | ||
mb_internal_encoding("UTF-8"); | ||
mb_language("uni"); | ||
$to = "[email protected]"; | ||
$subject = "test mail"; | ||
$message = "body of testing php mail"; | ||
$header["Mime-Version"] = "1.0"; | ||
$header["Content-Type"] = "text/html; charset=UTF-8"; | ||
$header["From"] = "[email protected]"; | ||
$header["X-Mailer"] = "PHP/" . phpversion(); | ||
mb_send_mail($to, $subject, $message, $header); | ||
|
||
$stream = fopen(__DIR__ . "/gh8086.eml", "rb"); | ||
$eml = stream_get_contents($stream); | ||
fclose($stream); | ||
var_dump(preg_match_all('/(?<!\r)\n/', $eml)); | ||
?> | ||
--CLEAN-- | ||
<?php | ||
@unlink(__DIR__ . "/gh8086.eml"); | ||
?> | ||
--EXPECT-- | ||
int(6) |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
--TEST-- | ||
GH-8086 (Mail() function not working correctly in PHP 8.x) | ||
--INI-- | ||
sendmail_path={MAIL:gh8086.out} | ||
mail.mixed_lf_and_crlf=on | ||
--FILE-- | ||
<?php | ||
var_dump(mail('[email protected]', 'Test Subject', 'A Message', 'KHeaders')); | ||
$mail = file_get_contents('gh8086.out'); | ||
var_dump(preg_match_all('/(?<!\r)\n/', $mail)); | ||
?> | ||
--CLEAN-- | ||
<?php | ||
unlink('gh8086.out'); | ||
?> | ||
--EXPECT-- | ||
bool(true) | ||
int(5) |
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
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
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
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