- Merge: Fixed bug #49627 (error_log to specified file does not log time according...

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 182b4dd3a386e0be58b3de881f2315cdc3f870f2..fe3a7a5b0252a5c5d8973e43927ec51b411007cb 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -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

diff --git a/main/main.c b/main/main.c
index 6c9224be36e46983e1327f7240d3dedebc3ff2b0..815fb9cb5c617b82e6f22587658ffb0863e2a941 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -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);

diff --git a/main/php_globals.h b/main/php_globals.h
index 64b2f734a98267778f1337bc8aad4b0edfea6e6a..646c761648ecad4afb9ff9172706e9c01879a143 100644 (file)
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -168,6 +168,8 @@ struct _php_core_globals {
 
        zend_bool mail_x_header;
        char *mail_log;
+
+       zend_bool in_error_log;
 };