Permalink
Browse files

Fixed bug #49627 (error_log to specified file does not log time accor…

…ding to date.timezone)
  • Loading branch information...
1 parent 8172c38 commit ffb07732f7418d78d74454a7850d358f95753a23 Dmitry Stogov committed Oct 5, 2009
Showing with 24 additions and 2 deletions.
  1. +11 −1 ext/date/php_date.c
  2. +11 −1 main/main.c
  3. +2 −0 main/php_globals.h
View
@@ -849,7 +849,17 @@ static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC)
return env;
}
/* Check config setting for default timezone */
- if (DATEG(default_timezone) && (strlen(DATEG(default_timezone)) > 0) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
+ if (!DATEG(default_timezone)) {
+ /* Special case: ext/date wasn't initialized yet */
+ zval ztz;
+
+ if (SUCCESS == zend_get_configuration_directive("date.timezone", sizeof("date.timezone"), &ztz) &&
+ Z_TYPE(ztz) == IS_STRING &&
+ Z_STRLEN(ztz) > 0 &&
+ timelib_timezone_id_is_valid(Z_STRVAL(ztz), tzdb)) {
+ return Z_STRVAL(ztz);
+ }
+ } else if (*DATEG(default_timezone) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
return DATEG(default_timezone);
}
#if HAVE_TM_ZONE
View
@@ -556,11 +556,18 @@ PHPAPI void php_log_err(char *log_message TSRMLS_DC)
int fd = -1;
time_t error_time;
+ if (PG(in_error_log)) {
+ /* prevent recursive invocation */
+ return;
+ }
+ PG(in_error_log) = 1;
+
/* Try to use the specified logging location. */
if (PG(error_log) != NULL) {
#ifdef HAVE_SYSLOG_H
if (!strcmp(PG(error_log), "syslog")) {
php_syslog(LOG_NOTICE, "%.500s", log_message);
+ PG(in_error_log) = 0;
return;
}
#endif
@@ -571,7 +578,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, php_during_module_startup() TSRMLS_CC);
+ error_time_str = php_format_date("d-M-Y H:i:s", 11, error_time, 1 TSRMLS_CC);
len = spprintf(&tmp, 0, "[%s] %s%s", error_time_str, log_message, PHP_EOL);
#ifdef PHP_WIN32
php_flock(fd, 2);
@@ -580,6 +587,7 @@ PHPAPI void php_log_err(char *log_message TSRMLS_DC)
efree(tmp);
efree(error_time_str);
close(fd);
+ PG(in_error_log) = 0;
return;
}
}
@@ -589,6 +597,7 @@ PHPAPI void php_log_err(char *log_message TSRMLS_DC)
if (sapi_module.log_message) {
sapi_module.log_message(log_message);
}
+ PG(in_error_log) = 0;
}
/* }}} */
@@ -1352,6 +1361,7 @@ int php_request_startup(TSRMLS_D)
#endif
zend_try {
+ PG(in_error_log) = 0;
PG(during_request_startup) = 1;
php_output_activate(TSRMLS_C);
View
@@ -168,6 +168,8 @@ struct _php_core_globals {
zend_bool mail_x_header;
char *mail_log;
+
+ zend_bool in_error_log;
};

0 comments on commit ffb0773

Please sign in to comment.