You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2015/04/23 17:53:23 UTC
trafficserver git commit: TS-3551: Fix LogUtils.cc compile on Illumos
Repository: trafficserver
Updated Branches:
refs/heads/master 172db8e1c -> 6f4bea0b7
TS-3551: Fix LogUtils.cc compile on Illumos
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6f4bea0b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6f4bea0b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6f4bea0b
Branch: refs/heads/master
Commit: 6f4bea0b7e736454cb8697f29ba2b398ab8a0f77
Parents: 172db8e
Author: Phil Sorber <so...@apache.org>
Authored: Thu Apr 23 09:51:28 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Thu Apr 23 09:51:28 2015 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
proxy/logging/LogUtils.cc | 4 ++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6f4bea0b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e8fe3ab..1596245 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-3551] Fix LogUtils.cc compile on Illumos.
+
*) [TS-3548] Fix psiginfo usage on Illumos.
*) [TS-3529] Add config option to allow ATS to start even if certificate files are bad.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6f4bea0b/proxy/logging/LogUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogUtils.cc b/proxy/logging/LogUtils.cc
index 2a5cd2f..4099f54 100644
--- a/proxy/logging/LogUtils.cc
+++ b/proxy/logging/LogUtils.cc
@@ -103,7 +103,11 @@ LogUtils::timestamp_to_netscape_str(long timestamp)
//
struct tm res;
struct tm *tms = ink_localtime_r((const time_t *)×tamp, &res);
+#if defined(solaris)
+ long zone = (tms->tm_isdst > 0) ? altzone : timezone;
+#else
long zone = -tms->tm_gmtoff; // double negative!
+#endif
int offset;
char sign;