Merged revisions 51256 via svnmerge from

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

................
r51256 | tilghman | 2007-01-18 15:14:24 -0600 (Thu, 18 Jan 2007) | 10 lines

Merged revisions 51255 via svnmerge from
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/trunk@51257 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index effb987..e54f2af 100644 (file)
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -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