derick Thu Jan 17 20:43:58 2008 UTC Added files: /php-src/ext/date/tests bug43075.phpt
Modified files: /php-src/ext/date/lib parse_date.c parse_date.re Log: - Fixed bug #43075 (Support 2007-11-01T24:00:00+00:00). http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.75&r2=1.76&diff_format=u Index: php-src/ext/date/lib/parse_date.c diff -u php-src/ext/date/lib/parse_date.c:1.75 php-src/ext/date/lib/parse_date.c:1.76 --- php-src/ext/date/lib/parse_date.c:1.75 Sun Jan 13 15:16:47 2008 +++ php-src/ext/date/lib/parse_date.c Thu Jan 17 20:43:58 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.12.1 on Sun Jan 13 15:57:11 2008 */ +/* Generated by re2c 0.12.1 on Thu Jan 17 21:42:37 2008 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.c,v 1.75 2008/01/13 15:16:47 derick Exp $ */ +/* $Id: parse_date.c,v 1.76 2008/01/17 20:43:58 derick Exp $ */ #include "timelib.h" @@ -1451,8 +1451,8 @@ case '0': case '1': case '2': - case '3': goto yy1238; - case '4': + case '3': + case '4': goto yy1238; case '5': case '6': case '7': @@ -5548,7 +5548,7 @@ if(yych == '.') goto yy371; goto yy308; } else { - if(yych <= '3') goto yy403; + if(yych <= '4') goto yy403; if(yych <= '9') goto yy400; if(yych <= ':') goto yy371; goto yy308; @@ -5630,7 +5630,7 @@ if(yych == '.') goto yy330; goto yy53; } else { - if(yych <= '3') goto yy329; + if(yych <= '4') goto yy329; if(yych == ':') goto yy330; goto yy53; } @@ -6013,7 +6013,7 @@ yych = *++YYCURSOR; if(yych <= '5') { if(yych <= '/') goto yy332; - if(yych >= '4') goto yy365; + if(yych >= '5') goto yy365; } else { if(yych <= '9') goto yy337; if(yych <= ':') goto yy364; @@ -6073,7 +6073,7 @@ if(yych == '.') goto yy371; goto yy308; } else { - if(yych <= '3') goto yy398; + if(yych <= '4') goto yy398; if(yych <= '9') goto yy370; if(yych <= ':') goto yy371; goto yy308; @@ -6633,7 +6633,7 @@ if(yych == '.') goto yy371; goto yy308; } else { - if(yych <= '3') goto yy413; + if(yych <= '4') goto yy413; if(yych <= '9') goto yy412; if(yych <= ':') goto yy371; goto yy308; @@ -6714,7 +6714,7 @@ if(yych == '.') goto yy420; goto yy308; } else { - if(yych <= '3') goto yy434; + if(yych <= '4') goto yy434; if(yych <= '9') goto yy433; if(yych <= ':') goto yy420; goto yy308; @@ -7210,7 +7210,7 @@ if(yych == '.') goto yy447; goto yy308; } else { - if(yych <= '3') goto yy458; + if(yych <= '4') goto yy458; if(yych <= '9') goto yy457; if(yych <= ':') goto yy447; goto yy308; @@ -11893,7 +11893,7 @@ if(yych <= 0x1F) goto yy3; goto yy57; } else { - if(yych <= '3') { + if(yych <= '4') { if(yych <= '/') goto yy3; goto yy662; } else { @@ -15000,7 +15000,7 @@ YYDEBUG(874, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy53; - if(yych >= '4') goto yy53; + if(yych >= '5') goto yy53; yy875: YYDEBUG(875, *YYCURSOR); yych = *++YYCURSOR; @@ -15095,7 +15095,7 @@ yych = *++YYCURSOR; if(yych <= '5') { if(yych <= '/') goto yy887; - if(yych >= '4') goto yy891; + if(yych >= '5') goto yy891; } else { if(yych <= '9') goto yy892; if(yych <= ':') goto yy890; @@ -16359,7 +16359,7 @@ YYDEBUG(1012, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy53; - if(yych >= '4') goto yy53; + if(yych >= '5') goto yy53; yy1013: YYDEBUG(1013, *YYCURSOR); yych = *++YYCURSOR; @@ -16750,7 +16750,7 @@ YYDEBUG(1031, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy53; - if(yych <= '3') goto yy1037; + if(yych <= '4') goto yy1037; if(yych <= '5') goto yy1033; goto yy53; yy1032: @@ -16836,7 +16836,7 @@ yych = *++YYCURSOR; if(yych <= '5') { if(yych <= '/') goto yy53; - if(yych <= '3') goto yy1052; + if(yych <= '4') goto yy1052; goto yy1033; } else { if(yych == ':') goto yy1046; @@ -17749,7 +17749,7 @@ YYDEBUG(1165, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy53; - if(yych <= '3') goto yy1166; + if(yych <= '4') goto yy1166; if(yych == ':') goto yy1167; goto yy53; yy1166: @@ -17918,7 +17918,7 @@ YYDEBUG(1182, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy53; - if(yych <= '3') goto yy1183; + if(yych <= '4') goto yy1183; if(yych == ':') goto yy1167; goto yy53; yy1183: @@ -18003,7 +18003,7 @@ yych = *++YYCURSOR; if(yych <= '5') { if(yych <= '/') goto yy1021; - if(yych >= '4') goto yy1199; + if(yych >= '5') goto yy1199; } else { if(yych <= '9') goto yy1020; if(yych <= ':') goto yy1198; @@ -19528,7 +19528,7 @@ if(yych == '.') goto yy1240; goto yy53; } else { - if(yych <= '3') goto yy1285; + if(yych <= '4') goto yy1285; if(yych == ':') goto yy1240; goto yy53; } http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.66&r2=1.67&diff_format=u Index: php-src/ext/date/lib/parse_date.re diff -u php-src/ext/date/lib/parse_date.re:1.66 php-src/ext/date/lib/parse_date.re:1.67 --- php-src/ext/date/lib/parse_date.re:1.66 Sun Jan 13 15:16:48 2008 +++ php-src/ext/date/lib/parse_date.re Thu Jan 17 20:43:58 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.re,v 1.66 2008/01/13 15:16:48 derick Exp $ */ +/* $Id: parse_date.re,v 1.67 2008/01/17 20:43:58 derick Exp $ */ #include "timelib.h" @@ -836,8 +836,8 @@ ago = 'ago'; -hour24 = [01]?[0-9] | "2"[0-3]; -hour24lz = [01][0-9] | "2"[0-3]; +hour24 = [01]?[0-9] | "2"[0-4]; +hour24lz = [01][0-9] | "2"[0-4]; hour12 = "0"?[1-9] | "1"[0-2]; minute = [0-5]?[0-9]; minutelz = [0-5][0-9]; http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43075.phpt?view=markup&rev=1.1 Index: php-src/ext/date/tests/bug43075.phpt +++ php-src/ext/date/tests/bug43075.phpt --TEST-- Bug #43075 (Support 24 as hour) --FILE-- <?php $d = date_create("2007-11-01T24:34:00+00:00"); echo $d->format("c"); ?> --EXPECT-- 2007-11-02T00:34:00+00:00 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php