Merge branch 'PHP-7.1'

* Add subject to mail.log
This commit is contained in:
Joe Watkins 2017-01-01 14:40:20 +00:00
commit 8d316e6a3e
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E

View File

@ -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);