kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 51255 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r51255 | tilghman | 2007-01-18 15:11:34 -0600 (Thu, 18 Jan 2007) | 2 lines

If a timezone is not specified, assume localtime (instead of gmtime) (Issue #7748)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@51256 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-01-18 21:14:24 +00:00
parent f6132a8ec4
commit 8d59d5173a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/stdtime/localtime.c
View File

@@ -61,6 +61,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/localtime.h"
#include "asterisk/strings.h"
#ifndef lint
#ifndef NOID
@@ -1055,7 +1056,7 @@ const char * const zone;
#ifdef _THREAD_SAFE
ast_mutex_lock(&lcl_mutex);
#endif
ast_tzset(zone);
ast_tzset(ast_strlen_zero(zone) ? "/etc/localtime" : zone);
localsub(timep, 0L, p_tm, zone);
#ifdef _THREAD_SAFE
ast_mutex_unlock(&lcl_mutex);
@@ -1495,8 +1496,8 @@ const char * const zone;
#ifdef _THREAD_SAFE
ast_mutex_lock(&lcl_mutex);
#endif
ast_tzset(zone);
mktime_return_value = time1(tmp, localsub, 0L, zone);
ast_tzset(!ast_strlen_zero(zone) ? zone : "/etc/localtime");
mktime_return_value = time1(tmp, localsub, 0L, !ast_strlen_zero(zone) ? zone : "/etc/localtime");
#ifdef _THREAD_SAFE
ast_mutex_unlock(&lcl_mutex);
#endif