diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-01 14:39:35 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-01 14:39:35 +0000 |
| commit | e7d4a8ce8bcefeaa027400a25e17e3bfaf6c03b0 (patch) | |
| tree | a41bdef3f512cf1dbbee2313bc20f1c974c028e7 | |
| parent | 878b8f046593085365466f20c756a2d429164707 (diff) | |
| parent | e37b5f20fb351891536d07b4a1e46cfff56ba25d (diff) | |
| download | php-git-e7d4a8ce8bcefeaa027400a25e17e3bfaf6c03b0.tar.gz | |
Merge branch 'pull-request/1414' into 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 b27e12adc1..e88ab38cd1 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -294,7 +294,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); |