From: Derick Rethans <derick@php.net>
Date: Fri, 25 Nov 2011 14:06:55 +0000 (+0000)
Subject: - Fixed bug #60373 (Startup errors with log_errors on cause segfault).
X-Git-Tag: php-5.3.9RC3~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45ae82d3f13c9ba7e4625ca0c267ed0e98f904c4;p=php

- Fixed bug #60373 (Startup errors with log_errors on cause segfault).
---

diff --git a/NEWS b/NEWS
index 39373d9d40..be4e3c8a5c 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,8 @@ PHP                                                                        NEWS
   . 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
diff --git a/main/main.c b/main/main.c
index 1ce01e0280..8e52412cdd 100644
--- a/main/main.c
+++ b/main/main.c
@@ -599,7 +599,7 @@ PHPAPI void php_log_err(char *log_message TSRMLS_DC)
 			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);