diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-01 14:40:20 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-01 14:40:20 +0000 |
| commit | 8d316e6a3e510c71cee1b52bfd08d2df4576a09d (patch) | |
| tree | d03baa5d57f68bc08bfe71bde6e449c484d51921 | |
| parent | 489d5ac2fcabe5a77464493ae6ffd994c0f89592 (diff) | |
| parent | e7d4a8ce8bcefeaa027400a25e17e3bfaf6c03b0 (diff) | |
| download | php-git-8d316e6a3e510c71cee1b52bfd08d2df4576a09d.tar.gz | |
Merge branch 'PHP-7.1'
* Add subject to mail.log
| -rw-r--r-- | ext/standard/mail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 8108225008..cdf94f0d55 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -497,7 +497,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char time(&curtime); date_str = php_format_date("d-M-Y H:i:s e", 13, curtime, 1); - l = spprintf(&tmp, 0, "[%s] mail() on [%s:%d]: To: %s -- Headers: %s\n", ZSTR_VAL(date_str), zend_get_executed_filename(), zend_get_executed_lineno(), to, hdr ? hdr : ""); + l = spprintf(&tmp, 0, "[%s] mail() on [%s:%d]: To: %s -- Headers: %s -- Subject: %s\n", ZSTR_VAL(date_str), zend_get_executed_filename(), zend_get_executed_lineno(), to, hdr ? hdr : "", subject); zend_string_free(date_str); |