From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 3 Mar 2014 10:00:56 +0000 (+0800)
Subject: Fixed php_mail log
X-Git-Tag: POST_PHPNG_MERGE~412^2~436^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1aecda4c4386f7acc11e35560ec8bcb3f520fb4c;p=php

Fixed php_mail log
---

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index a97e3d51dc..0977a284ea 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -248,16 +248,17 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
 	return val;	\
 
 	if (mail_log && *mail_log) {
-		char *tmp, *date_str;
+		char *tmp;
 		time_t curtime;
 		int l;
+		zend_string *date_str;
 
 		time(&curtime);
 		date_str = php_format_date("d-M-Y H:i:s e", 13, curtime, 1 TSRMLS_CC);
 
-		l = spprintf(&tmp, 0, "[%s] mail() on [%s:%d]: To: %s -- Headers: %s\n", date_str, zend_get_executed_filename(TSRMLS_C), zend_get_executed_lineno(TSRMLS_C), to, hdr ? hdr : "");
+		l = spprintf(&tmp, 0, "[%s] mail() on [%s:%d]: To: %s -- Headers: %s\n", date_str->val, zend_get_executed_filename(TSRMLS_C), zend_get_executed_lineno(TSRMLS_C), to, hdr ? hdr : "");
 
-		efree(date_str);
+		STR_FREE(date_str);
 
 		if (hdr) {
 			php_mail_log_crlf_to_spaces(tmp);