Re: com php-src: fix windows build: ext/standard/mail.c
| From: | Lars Strojny | Date: | Sun, 06 Jan 2013 18:41:34 +0000 |
| Subject: | Re: com php-src: fix windows build: ext/standard/mail.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-70878@lists.php.net to get a copy of this message | ||
Thanks for fixing. Could you merge to 5.5 as well? If not, I could do as well.
--
Sent from my iPhone
Am 06.01.2013 um 18:37 schrieb Anatoliy Belsky <ab@php.net>:
> Commit: 8a481c711a1c899971494d88086701ca783c6795
> Author: Anatoliy Belsky <ab@php.net> Sun, 6 Jan 2013 18:37:26 +0100
> Parents: 98331c89a178add153f9f30484f59300499fc742
> Branches: master
>
> Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a481c711a1c899971494d88086701ca783c6795
>
> Log:
> fix windows build
>
> Changed paths:
> M ext/standard/mail.c
>
>
> Diff:
> diff --git a/ext/standard/mail.c b/ext/standard/mail.c
> index c8fd55e..4c243f7 100644
> --- a/ext/standard/mail.c
> +++ b/ext/standard/mail.c
> @@ -250,11 +250,12 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char
*headers, char
> if (mail_log && *mail_log) {
> char *tmp, *date_str;
> time_t curtime;
> + int l;
>
> time(&curtime);
> date_str = php_format_date("d-M-Y H:i:s e", 13, curtime, 1 TSRMLS_CC);
>
> - int 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, zend_get_executed_filename(TSRMLS_C), zend_get_executed_lineno(TSRMLS_C), to, hdr ? hdr :
"");
>
> efree(date_str);
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>