kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@51255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-01-18 21:11:34 +00:00
parent 6f1d7511d1
commit 3f07bd5034
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
stdtime/localtime.c
View File

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