Merged revisions 85921 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r85921 | tilghman | 2007-10-16 14:41:40 -0500 (Tue, 16 Oct 2007) | 4 lines

Also set up gmtoff (this is used in the %z gnu extension to strftime)
Reported and fixed by jcmoore
Closes issue #11002

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85943 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index af8fe39..44607c9 100644 (file)
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -1131,6 +1131,7 @@ static struct ast_tm *localsub(const struct timeval *timep, const long offset, s
        */
        result = timesub(&t, ttisp->tt_gmtoff, sp, tmp);
        tmp->tm_isdst = ttisp->tt_isdst;
+       tmp->tm_gmtoff = ttisp->tt_gmtoff;
 #ifdef TM_ZONE
        tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind];
 #endif /* defined TM_ZONE */