Re: [PHP-CVS] com php-src: fix windows build: ext/standard/mail.c

2013-01-06 Thread Lars Strojny
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 a...@php.net:

 Commit:8a481c711a1c899971494d88086701ca783c6795
 Author:Anatoliy Belsky a...@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
 

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] com php-src: fix windows build: ext/standard/mail.c

2013-01-06 Thread Anatoliy Belsky
Hi Lars,

the issue was only 5.5 and master, 5.4 is fine. Everything is merged so
no worries.

Cheers

Anatoliy

On Sun, 2013-01-06 at 19:41 +0100, Lars Strojny wrote: 
 Thanks for fixing. Could you merge to 5.5 as well? If not, I could do as well.
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php