cvs: php-src(PHP_5_1) / NEWS /ext/date php_date.c php_date.h /ext/date/tests bug35143.phpt date_create-2.phpt date_modify-1.phpt date_modify-2.phpt
/ext/standard microtime.c

From: Date: Sun, 20 Nov 2005 20:14:24 +0000
Subject: cvs: php-src(PHP_5_1) / NEWS /ext/date php_date.c php_date.h /ext/date/tests bug35143.phpt date_create-2.phpt date_modify-1.phpt date_modify-2.phpt
/ext/standard microtime.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-35291@lists.php.net to get a copy of this message
derick Sun Nov 20 15:14:24 2005 EDT Added files: (Branch: PHP_5_1) /php-src/ext/date/tests bug35143.phpt Modified files: /php-src NEWS /php-src/ext/standard microtime.c /php-src/ext/date php_date.c php_date.h /php-src/ext/date/tests date_create-2.phpt date_modify-1.phpt date_modify-2.phpt Log: - Fixed bug #35143 (gettimeofday() ignores current time zone). - Fixed tests due to class constants patch. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.211&r2=1.2027.2.212&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.211 php-src/NEWS:1.2027.2.212 --- php-src/NEWS:1.2027.2.211 Sun Nov 20 15:06:26 2005 +++ php-src/NEWS Sun Nov 20 15:14:21 2005 @@ -7,6 +7,7 @@ - Fixed bug #35273 (Error in mapping soap - java types). (Dmitry) - Fixed bug #35243 (php_mblen() crashes when compiled with thread-safety on Linux). (Patch: shulmanb at il dot ibm dot com, Jani) +- Fixed bug #35143 (gettimeofday() ignores current time zone). (Derick) - Fixed bug #33153 (crash in mssql_next result). (Frank) - Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank) - Fixed bug #33201 (Crash when fetching some data types). (Frank) http://cvs.php.net/diff.php/php-src/ext/standard/microtime.c?r1=1.53&r2=1.53.2.1&ty=u Index: php-src/ext/standard/microtime.c diff -u php-src/ext/standard/microtime.c:1.53 php-src/ext/standard/microtime.c:1.53.2.1 --- php-src/ext/standard/microtime.c:1.53 Wed Aug 3 10:08:09 2005 +++ php-src/ext/standard/microtime.c Sun Nov 20 15:14:23 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: microtime.c,v 1.53 2005/08/03 14:08:09 sniper Exp $ */ +/* $Id: microtime.c,v 1.53.2.1 2005/11/20 20:14:23 derick Exp $ */ #include "php.h" @@ -43,6 +43,7 @@ #include <errno.h> #include "microtime.h" +#include "ext/date/php_date.h" #define NUL '\0' #define MICRO_IN_SEC 1000000.00 @@ -68,15 +69,18 @@ } if (mode) { + timelib_time_offset *offset; + + offset = timelib_get_time_zone_info(tp.tv_sec, get_timezone_info(TSRMLS_C)); + array_init(return_value); add_assoc_long(return_value, "sec", tp.tv_sec); add_assoc_long(return_value, "usec", tp.tv_usec); -#ifdef PHP_WIN32 - add_assoc_long(return_value, "minuteswest", tz.tz_minuteswest/SEC_IN_MIN); -#else - add_assoc_long(return_value, "minuteswest", tz.tz_minuteswest); -#endif - add_assoc_long(return_value, "dsttime", tz.tz_dsttime); + + add_assoc_long(return_value, "minuteswest", -offset->offset / SEC_IN_MIN); + add_assoc_long(return_value, "dsttime", offset->is_dst); + + timelib_time_offset_dtor(offset); } else { char ret[100]; http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.21&r2=1.43.2.22&ty=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.21 php-src/ext/date/php_date.c:1.43.2.22 --- php-src/ext/date/php_date.c:1.43.2.21 Thu Nov 17 16:05:30 2005 +++ php-src/ext/date/php_date.c Sun Nov 20 15:14:23 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.43.2.21 2005/11/17 21:05:30 iliaa Exp $ */ +/* $Id: php_date.c,v 1.43.2.22 2005/11/20 20:14:23 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -363,7 +363,7 @@ return "UTC"; } -static timelib_tzinfo *get_timezone_info(TSRMLS_D) +PHPAPI timelib_tzinfo *get_timezone_info(TSRMLS_D) { char *tz; timelib_tzinfo *tzi; http://cvs.php.net/diff.php/php-src/ext/date/php_date.h?r1=1.17.2.4&r2=1.17.2.5&ty=u Index: php-src/ext/date/php_date.h diff -u php-src/ext/date/php_date.h:1.17.2.4 php-src/ext/date/php_date.h:1.17.2.5 --- php-src/ext/date/php_date.h:1.17.2.4 Wed Oct 5 04:20:44 2005 +++ php-src/ext/date/php_date.h Sun Nov 20 15:14:24 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.h,v 1.17.2.4 2005/10/05 08:20:44 derick Exp $ */ +/* $Id: php_date.h,v 1.17.2.5 2005/11/20 20:14:24 derick Exp $ */ #ifndef PHP_DATE_H #define PHP_DATE_H @@ -99,5 +99,6 @@ /* Mechanism to set new TZ database */ PHPAPI void php_date_set_tzdb(timelib_tzdb *tzdb); +PHPAPI timelib_tzinfo *get_timezone_info(TSRMLS_D); #endif /* PHP_DATE_H */ http://cvs.php.net/diff.php/php-src/ext/date/tests/date_create-2.phpt?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/date/tests/date_create-2.phpt diff -u php-src/ext/date/tests/date_create-2.phpt:1.1 php-src/ext/date/tests/date_create-2.phpt:1.1.2.1 --- php-src/ext/date/tests/date_create-2.phpt:1.1 Wed Jul 20 04:31:02 2005 +++ php-src/ext/date/tests/date_create-2.phpt Sun Nov 20 15:14:24 2005 @@ -6,7 +6,7 @@ <?php date_default_timezone_set("GMT"); $d = date_create("2005-07-18 22:10:00 +0400"); -echo $d->format(DATE_RFC822), "\n"; +echo $d->format(date::RFC822), "\n"; ?> --EXPECT-- Mon, 18 Jul 2005 22:10:00 GMT+0400 http://cvs.php.net/diff.php/php-src/ext/date/tests/date_modify-1.phpt?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/date/tests/date_modify-1.phpt diff -u php-src/ext/date/tests/date_modify-1.phpt:1.1 php-src/ext/date/tests/date_modify-1.phpt:1.1.2.1 --- php-src/ext/date/tests/date_modify-1.phpt:1.1 Wed Jul 20 04:31:02 2005 +++ php-src/ext/date/tests/date_modify-1.phpt Sun Nov 20 15:14:24 2005 @@ -6,20 +6,20 @@ <?php date_default_timezone_set("Pacific/Kwajalein"); $ts = date_create("Thu Aug 19 1993 23:59:59"); -echo date_format($ts, DATE_RFC822), "\n"; +echo date_format($ts, date::RFC822), "\n"; $ts->modify("+1 second"); -echo date_format($ts, DATE_RFC822), "\n"; +echo date_format($ts, date::RFC822), "\n"; date_default_timezone_set("Europe/Amsterdam"); $ts = date_create("Sun Mar 27 01:59:59 2005"); -echo date_format($ts, DATE_RFC822), "\n"; +echo date_format($ts, date::RFC822), "\n"; $ts->modify("+1 second"); -echo date_format($ts, DATE_RFC822), "\n"; +echo date_format($ts, date::RFC822), "\n"; $ts = date_create("Sun Oct 30 01:59:59 2005"); -echo date_format($ts, DATE_RFC822), "\n"; +echo date_format($ts, date::RFC822), "\n"; $ts->modify("+ 1 hour 1 second"); -echo date_format($ts, DATE_RFC822), "\n"; +echo date_format($ts, date::RFC822), "\n"; ?> --EXPECT-- Thu, 19 Aug 1993 23:59:59 KWAT http://cvs.php.net/diff.php/php-src/ext/date/tests/date_modify-2.phpt?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/date/tests/date_modify-2.phpt diff -u php-src/ext/date/tests/date_modify-2.phpt:1.1 php-src/ext/date/tests/date_modify-2.phpt:1.1.2.1 --- php-src/ext/date/tests/date_modify-2.phpt:1.1 Wed Jul 20 04:31:02 2005 +++ php-src/ext/date/tests/date_modify-2.phpt Sun Nov 20 15:14:24 2005 @@ -6,9 +6,9 @@ <?php date_default_timezone_set("GMT"); $d = date_create("2005-07-18 22:10:00 +0400"); -echo date_format($d, DATE_RFC822), "\n"; +echo date_format($d, date::RFC822), "\n"; date_modify($d, "+1 hour"); -echo date_format($d, DATE_RFC822), "\n"; +echo date_format($d, date::RFC822), "\n"; ?> --EXPECT-- Mon, 18 Jul 2005 22:10:00 GMT+0400 http://cvs.php.net/co.php/php-src/ext/date/tests/bug35143.phpt?r=1.1&p=1 Index: php-src/ext/date/tests/bug35143.phpt +++ php-src/ext/date/tests/bug35143.phpt

« previous php.cvs (#35291) next »