Fixed bug #27175 (tzset() is not being called by PHP on startup).

diff --git a/main/main.c b/main/main.c
index 7ea44cf28538b2a62b2dd577f7445091b34287da..1756813dd5621adb17e882e67e023688a35e573f 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -794,7 +794,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
                        }
                /* no break - intentionally */
                case E_ERROR:
-               /*case E_PARSE: the parser would return 1 (failure), we can bail out nicely */
+               /* case E_PARSE: the parser would return 1 (failure), we can bail out nicely */
                case E_COMPILE_ERROR:
                case E_USER_ERROR:
                        EG(exit_status) = 255;
@@ -1386,6 +1386,10 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
        setlocale(LC_CTYPE, "");
 #endif
 
+#if HAVE_TZSET
+       tzset();
+#endif
+
 #if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK))
        /* start up winsock services */
        if (WSAStartup(wVersionRequested, &wsaData) != 0) {