commit 415b1ce1b93a3b74efe8a3ee5a35ee55e0a11caa
author Igor Sysoev <igor@sysoev.ru> Thu Jun 17 17:18:53 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Thu Jun 17 17:18:53 2004 +0000
tree 077bf24b4f310a87ab8bff140c730cb679069988
parent f924e6b694db7fd1d99473b3d7db7eb2b49c9e62

nginx-0.0.7-2004-06-17-21:18:53 import

src/core/ngx_times.c

diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c
index ac2a3a9..aa461c5 100644
--- a/src/core/ngx_times.c
+++ b/src/core/ngx_times.c
@@ -123,15 +123,20 @@
     ngx_cached_http_time.data = p;
 
 
-#if (HAVE_TIMEZONE)
+#if (HAVE_GETTIMEZONE)
 
-    ngx_gmtoff = ngx_timezone();
+    ngx_gmtoff = ngx_gettimezone();
     ngx_gmtime(ngx_cached_time + ngx_gmtoff * 60, &tm);
 
+#elif (HAVE_GMTOFF)
+
+    ngx_localtime(&tm);
+    ngx_gmtoff = tm.ngx_tm_gmtoff / 60;
+
 #else
 
     ngx_localtime(&tm);
-    ngx_gmtoff = tm.ngx_tm_gmtoff / 60;
+    ngx_gmtoff = ngx_timezone(tm.ngx_tm_isdst);
 
 #endif