derick Wed Jul 16 15:41:15 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/date/tests bug45529.phpt
Modified files:
/php-src/ext/date/lib parse_date.c parse_date.re
Log:
- MFH: Fixed bug #45529 (new DateTimeZone() and date_create()->getTimezone()
behave
different).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.30.2.14.2.21&r2=1.29.2.30.2.14.2.22&diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.21
php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.22
--- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.21 Tue Jul 15
17:38:07 2008
+++ php-src/ext/date/lib/parse_date.c Wed Jul 16 15:40:41 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Jul 15 19:21:36 2008 */
+/* Generated by re2c 0.13.5 on Wed Jul 16 17:24:19 2008 */
#line 1 "ext/date/lib/parse_date.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: parse_date.c,v 1.29.2.30.2.14.2.21 2008/07/15 17:38:07 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.30.2.14.2.22 2008/07/16 15:40:41 derick Exp $ */
#include "timelib.h"
@@ -800,7 +800,7 @@
}
#endif
/* If we have a TimeZone identifier to start with, use it */
- if (strstr(tz_abbr, "/")) {
+ if (strstr(tz_abbr, "/") || strcmp(tz_abbr, "UTC") == 0) {
if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) !=
NULL) {
t->tz_info = res;
t->zone_type = TIMELIB_ZONETYPE_ID;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.26.2.27.2.12.2.19&r2=1.26.2.27.2.12.2.20&diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.19
php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.20
--- php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.19 Tue Jul 15
17:38:27 2008
+++ php-src/ext/date/lib/parse_date.re Wed Jul 16 15:41:01 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: parse_date.re,v 1.26.2.27.2.12.2.19 2008/07/15 17:38:27 derick Exp $ */
+/* $Id: parse_date.re,v 1.26.2.27.2.12.2.20 2008/07/16 15:41:01 derick Exp $ */
#include "timelib.h"
@@ -798,7 +798,7 @@
}
#endif
/* If we have a TimeZone identifier to start with, use it */
- if (strstr(tz_abbr, "/")) {
+ if (strstr(tz_abbr, "/") || strcmp(tz_abbr, "UTC") == 0) {
if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) !=
NULL) {
t->tz_info = res;
t->zone_type = TIMELIB_ZONETYPE_ID;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug45529.phpt?view=markup&rev=1.1
Index: php-src/ext/date/tests/bug45529.phpt
+++ php-src/ext/date/tests/bug45529.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
