ngx_timezone_update()
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 725f54b..39d1e4c 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -47,6 +47,7 @@
u_char *lock_file;
ngx_uint_t i, n;
ngx_log_t *log;
+ ngx_time_t *tp;
ngx_conf_t conf;
ngx_pool_t *pool;
ngx_cycle_t *cycle, **old;
@@ -59,6 +60,16 @@
ngx_core_module_t *module;
char hostname[NGX_MAXHOSTNAMELEN];
+ ngx_timezone_update();
+
+ /* force localtime update with a new timezone */
+
+ tp = ngx_timeofday();
+ tp->sec = 0;
+
+ ngx_time_update(0, 0);
+
+
log = old_cycle->log;
pool = ngx_create_pool(NGX_CYCLE_POOL_SIZE, log);
diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c
index 99b2581..3105beb 100644
--- a/src/core/ngx_times.c
+++ b/src/core/ngx_times.c
@@ -50,10 +50,6 @@
ngx_cached_time = &cached_time[0];
-#if !(NGX_WIN32)
- tzset();
-#endif
-
ngx_time_update(0, 0);
}
diff --git a/src/os/unix/ngx_time.c b/src/os/unix/ngx_time.c
index 927132d..4ca8be6 100644
--- a/src/os/unix/ngx_time.c
+++ b/src/os/unix/ngx_time.c
@@ -8,6 +8,50 @@
#include <ngx_core.h>
+/*
+ * FreeBSD does not test /etc/localtime change, however, we can workaround it
+ * by calling tzset() with TZ and then without TZ to update timezone.
+ * The trick should work since FreeBSD 2.1.0.
+ *
+ * Linux does not test /etc/localtime change in localtime(),
+ * but may stat("/etc/localtime") several times in every strftime(),
+ * therefore we use it to update timezone.
+ *
+ * Solaris does not test /etc/TIMEZONE change too and no workaround available.
+ */
+
+void
+ngx_timezone_update(void)
+{
+#if (NGX_FREEBSD)
+
+ if (getenv("TZ")) {
+ return;
+ }
+
+ putenv("TZ=UTC");
+
+ tzset();
+
+ unsetenv("TZ");
+
+ tzset();
+
+#elif (NGX_LINUX)
+ time_t s;
+ struct tm *t;
+ char buf[4];
+
+ s = time(0);
+
+ t = localtime(&s);
+
+ strftime(buf, 4, "%H", t);
+
+#endif
+}
+
+
void
ngx_localtime(time_t s, ngx_tm_t *tm)
{
diff --git a/src/os/unix/ngx_time.h b/src/os/unix/ngx_time.h
index b31bd47..5d9406c 100644
--- a/src/os/unix/ngx_time.h
+++ b/src/os/unix/ngx_time.h
@@ -52,6 +52,7 @@
#endif
+void ngx_timezone_update(void);
void ngx_localtime(time_t s, ngx_tm_t *tm);
void ngx_libc_localtime(time_t s, struct tm *tm);
void ngx_libc_gmtime(time_t s, struct tm *tm);
diff --git a/src/os/win32/ngx_time.h b/src/os/win32/ngx_time.h
index 225c38c..4f93841 100644
--- a/src/os/win32/ngx_time.h
+++ b/src/os/win32/ngx_time.h
@@ -39,6 +39,8 @@
#define NGX_HAVE_GETTIMEZONE 1
+#define ngx_timezone_update()
+
ngx_int_t ngx_gettimezone(void);
void ngx_libc_localtime(time_t s, struct tm *tm);
void ngx_libc_gmtime(time_t s, struct tm *tm);
