-
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-7875: mails are sent even if failure to log throws exception
We explicitly check for an exception after the logging attempt, and bail out in that case. Co-authored-by: Tim Düsterhus <timwolla@googlemail.com> Closes GH-7878.
- Loading branch information
Showing
3 changed files
with
43 additions
and
0 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
--TEST-- | ||
GH-7875 (mails are sent even if failure to log throws exception) | ||
--INI-- | ||
sendmail_path={MAIL:{PWD}/gh7875.mail.out} | ||
mail.log={PWD}/gh7875.mail.log | ||
--FILE-- | ||
<?php | ||
function exception_error_handler($severity, $message, $file, $line) { | ||
if (!(error_reporting() & $severity)) { | ||
return; | ||
} | ||
throw new ErrorException($message, 0, $severity, $file, $line); | ||
} | ||
set_error_handler("exception_error_handler"); | ||
|
||
touch(__DIR__ . "/gh7875.mail.log"); | ||
chmod(__DIR__ . "/gh7875.mail.log", 0444); | ||
|
||
try { | ||
mail('recipient@example.com', 'Subject', 'Body', []); | ||
echo 'Not Reached'; | ||
} catch (\Exception $e) { | ||
echo $e->getMessage(), PHP_EOL; | ||
var_dump(file_exists(__DIR__ . "/gh7875.mail.out")); | ||
} | ||
?> | ||
--CLEAN-- | ||
<?php | ||
@chmod(__DIR__ . "/gh7875.mail.log", 0644); | ||
@unlink(__DIR__ . "/gh7875.mail.log"); | ||
@unlink(__DIR__ . "/gh7875.mail.out"); | ||
?> | ||
--EXPECTF-- | ||
mail(%s): Failed to open stream: Permission denied | ||
bool(false) |