svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/main.c branches/PHP_5_4/main/main.c trunk/main/main.c

derick Fri, 25 Nov 2011 14:06:55 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=319823 Log: - Fixed bug #60373 (Startup errors with log_errors on cause segfault). Bug: https://bugs.php.net/60373 (Closed) Startup errors with log_errors on cause segfault Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/main/main.c U php/php-src/branches/PHP_5_4/main/main.c U php/php-src/trunk/main/main.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-11-25 13:33:55 UTC (rev 319822) +++ php/php-src/branches/PHP_5_3/NEWS 2011-11-25 14:06:55 UTC (rev 319823) @@ -27,6 +27,8 @@ . Fixed bug #60377 (bcscale related crashes on 64bits platforms). (shm) - Date: + . Fixed bug #60373 (Startup errors with log_errors on cause segfault). + (Derick) . Fixed bug #60236 (TLA timezone dates are not converted properly from timestamp). (Derick) . Fixed bug #55253 (DateTime::add() and sub() result -1 hour on objects with Modified: php/php-src/branches/PHP_5_3/main/main.c =================================================================== --- php/php-src/branches/PHP_5_3/main/main.c 2011-11-25 13:33:55 UTC (rev 319822) +++ php/php-src/branches/PHP_5_3/main/main.c 2011-11-25 14:06:55 UTC (rev 319823) @@ -599,7 +599,7 @@ char *error_time_str; time(&error_time); - error_time_str = php_format_date("d-M-Y H:i:s", 11, error_time, 1 TSRMLS_CC); + error_time_str = php_format_date("d-M-Y H:i:s e", 13, error_time, 0 TSRMLS_CC); len = spprintf(&tmp, 0, "[%s] %s%s", error_time_str, log_message, PHP_EOL); #ifdef PHP_WIN32 php_flock(fd, 2); Modified: php/php-src/branches/PHP_5_4/main/main.c =================================================================== --- php/php-src/branches/PHP_5_4/main/main.c 2011-11-25 13:33:55 UTC (rev 319822) +++ php/php-src/branches/PHP_5_4/main/main.c 2011-11-25 14:06:55 UTC (rev 319823) @@ -575,7 +575,7 @@ char *error_time_str; time(&error_time); - error_time_str = php_format_date("d-M-Y H:i:s", 11, error_time, 1 TSRMLS_CC); + error_time_str = php_format_date("d-M-Y H:i:s e", 13, error_time, 0 TSRMLS_CC); len = spprintf(&tmp, 0, "[%s] %s%s", error_time_str, log_message, PHP_EOL); #ifdef PHP_WIN32 php_flock(fd, 2); Modified: php/php-src/trunk/main/main.c =================================================================== --- php/php-src/trunk/main/main.c 2011-11-25 13:33:55 UTC (rev 319822) +++ php/php-src/trunk/main/main.c 2011-11-25 14:06:55 UTC (rev 319823) @@ -575,7 +575,7 @@ char *error_time_str; time(&error_time); - error_time_str = php_format_date("d-M-Y H:i:s", 11, error_time, 1 TSRMLS_CC); + error_time_str = php_format_date("d-M-Y H:i:s e", 13, error_time, 0 TSRMLS_CC); len = spprintf(&tmp, 0, "[%s] %s%s", error_time_str, log_message, PHP_EOL); #ifdef PHP_WIN32 php_flock(fd, 2);