[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c parse_date.re

[Derick Rethans]

derick          Wed Jul 16 15:40:01 2008 UTC

  Modified files:              
    /php-src/ext/date/lib       parse_date.c parse_date.re 
  Log:
  - 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.94&r2=1.95&diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.94 
php-src/ext/date/lib/parse_date.c:1.95
--- php-src/ext/date/lib/parse_date.c:1.94      Tue Jul 15 17:37:32 2008
+++ php-src/ext/date/lib/parse_date.c   Wed Jul 16 15:40:00 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Jul 15 19:35:53 2008 */
+/* Generated by re2c 0.13.5 on Wed Jul 16 17:39:20 2008 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
    +----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: parse_date.c,v 1.94 2008/07/15 17:37:32 derick Exp $ */
+/* $Id: parse_date.c,v 1.95 2008/07/16 15:40:00 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.85&r2=1.86&diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.85 
php-src/ext/date/lib/parse_date.re:1.86
--- php-src/ext/date/lib/parse_date.re:1.85     Tue Jul 15 17:37:33 2008
+++ php-src/ext/date/lib/parse_date.re  Wed Jul 16 15:40:01 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: parse_date.re,v 1.85 2008/07/15 17:37:33 derick Exp $ */
+/* $Id: parse_date.re,v 1.86 2008/07/16 15:40: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;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php