]> granicus.if.org Git - php/commitdiff
Fixed php_mail log
authorXinchen Hui <laruence@gmail.com>
Mon, 3 Mar 2014 10:00:56 +0000 (18:00 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 3 Mar 2014 10:00:56 +0000 (18:00 +0800)
ext/standard/mail.c

index a97e3d51dc868bbfc8ae0e07fb7834df630fa402..0977a284ea7d1d04dec29c6d46fc172220e069a1 100644 (file)
@@ -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);