com php-src: Fix rebase error: ext/standard/mail.c

Commit: e37b5f20fb351891536d07b4a1e46cfff56ba25d Author: Tom Sommer <tomsommer@users.noreply.github.com> Tue, 14 Jul 2015 13:17:42 -0400 Committer: tomsommer <root@tstest.fbhlab.dk> Tue, 14 Jul 2015 13:18:47 -0400 Parents: 29f96ab37e3474e2c0ec3b4776b74b071ea755a6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e37b5f20fb351891536d07b4a1e46cfff56ba25d Log: Fix rebase error Changed paths: M ext/standard/mail.c Diff: diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 0b5541e..27d7be6 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 -- Subject: %s\n", date_str->val, zend_get_executed_filename(), zend_get_executed_lineno(), to, hdr ? hdr : "", subject); + 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);