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/05/05 06:21:15 UTC
[03/11] trafficserver git commit: TS-3551: Fix LogUtils.cc compile on
Illumos
TS-3551: Fix LogUtils.cc compile on Illumos
(cherry picked from commit 6f4bea0b7e736454cb8697f29ba2b398ab8a0f77)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ebc83f78
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ebc83f78
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ebc83f78
Branch: refs/heads/5.3.x
Commit: ebc83f783096e3413c4e267927ccf02c162348f7
Parents: ca0b0ef
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 10:24:12 2015 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
proxy/logging/LogUtils.cc | 4 ++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ebc83f78/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index ab0e075..be56126 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@ Changes with Apache Traffic Server 5.3.0
*) [TS-3533] Revert commits that break unregistered plugin loading.
+ *) [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/ebc83f78/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;