diff options
| author | Derick Rethans <derick@php.net> | 2011-11-25 14:06:55 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2011-11-25 14:06:55 +0000 |
| commit | 45ae82d3f13c9ba7e4625ca0c267ed0e98f904c4 (patch) | |
| tree | 769ca506bbbc4aa9e75d7d17089ff89a19a77275 | |
| parent | aa5ce0b58d4ae8df6e5a80fa1e5f7f2d9b895acb (diff) | |
| download | php-git-45ae82d3f13c9ba7e4625ca0c267ed0e98f904c4.tar.gz | |
- Fixed bug #60373 (Startup errors with log_errors on cause segfault).
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/main.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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); |