Fix for #69061 - Remove timestamp for mail.log = syslog#1087
Fix for #69061 - Remove timestamp for mail.log = syslog#1087tomsommer wants to merge 6 commits intophp:masterfrom
Conversation
ext/standard/mail.c
Outdated
There was a problem hiding this comment.
This will leak the old buffer occupied by msg, since spprintf will allocate the new one and the pointer to the old one will be lost. Please fix.
Fix for #69061 Make mail.log append correct PHP_EOL and remove timestamp when sending to syslog
ext/standard/mail.c
Outdated
There was a problem hiding this comment.
Isn't date_str already been freed in line 299?
|
@tomsommer fix conflicts please |
|
For some reason I'm still not able to merge this, even though there are no conflicts reported ... possibly your master branch is out of date ? |
|
@krakjoe Possibly related to http://news.php.net/php.internals/97726. |
|
Merged via e77a1db into 7.1+, thanks! I didn't merge into 7.0 as I don't want to change log file format in the middle of the release cycle (could break parsers etc). @krakjoe Not sure what the issue was, I just applied the diff directly. We should probably ask people to rebase changes onto master rather than merging it in. Otherwise the |
6 participants
Fix for #69061