cvs: php-src(PHP_5_1) / NEWS /ext/date php_date.c /ext/date/lib parse_date.c parse_date.re

derick Mon Mar 6 21:45:02 2006 UTC Modified files: (Branch: PHP_5_1) /php-src NEWS /php-src/ext/date php_date.c /php-src/ext/date/lib parse_date.c parse_date.re Log: - MFH: Fixed bug #36638 (strtotime() returns false when 2nd argument < 1). (Derick) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.443&r2=1.2027.2.444&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.443 php-src/NEWS:1.2027.2.444 --- php-src/NEWS:1.2027.2.443 Sun Mar 5 18:57:53 2006 +++ php-src/NEWS Mon Mar 6 21:44:53 2006 @@ -44,6 +44,7 @@ - Fixed tiger hash algorithm generating wrong results on big endian platforms. (Mike) - Fixed crash with DOMImplementation::createDocumentType("name:"). (Mike) +- Fixed bug #36638 (strtotime() returns false when 2nd argument < 1). (Derick) - Fixed bug #36611 (assignment to SimpleXML object attribute changes argument type to string). (Tony) - Fixed bug #36606 (pg_query_params() changes arguments type to string). (Tony) http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.43.2.41&r2=1.43.2.42&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.41 php-src/ext/date/php_date.c:1.43.2.42 --- php-src/ext/date/php_date.c:1.43.2.41 Fri Mar 3 07:52:55 2006 +++ php-src/ext/date/php_date.c Mon Mar 6 21:44:53 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.43.2.41 2006/03/03 07:52:55 derick Exp $ */ +/* $Id: php_date.c,v 1.43.2.42 2006/03/06 21:44:53 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -826,7 +826,7 @@ now = timelib_time_ctor(); initial_ts = emalloc(25); - snprintf(initial_ts, 24, "@%lu", preset_ts); + snprintf(initial_ts, 24, "@%ld", preset_ts); t = timelib_strtotime(initial_ts, strlen(initial_ts), &error1, DATE_TIMEZONEDB); /* we ignore the error here, as this should never fail */ timelib_update_ts(t, tzi); now->tz_info = tzi; http://cvs.php.net/viewcvs.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.28&r2=1.29.2.29&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.28 php-src/ext/date/lib/parse_date.c:1.29.2.29 --- php-src/ext/date/lib/parse_date.c:1.29.2.28 Mon Feb 27 19:41:27 2006 +++ php-src/ext/date/lib/parse_date.c Mon Mar 6 21:44:53 2006 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.12 on Mon Feb 27 20:39:38 2006 */ +/* Generated by re2c 0.9.12 on Mon Mar 6 22:37:54 2006 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.c,v 1.29.2.28 2006/02/27 19:41:27 derick Exp $ */ +/* $Id: parse_date.c,v 1.29.2.29 2006/03/06 21:44:53 derick Exp $ */ #include "timelib.h" @@ -1139,7 +1139,7 @@ yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == '-') goto yy1185; - if(yych <= '0') goto yy12; + if(yych <= '/') goto yy12; if(yych <= '9') goto yy1186; goto yy12; yy12: @@ -16619,7 +16619,7 @@ yy1185: YYDEBUG(1185, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '0') goto yy53; + if(yych <= '/') goto yy53; if(yych >= ':') goto yy53; goto yy1186; yy1186: http://cvs.php.net/viewcvs.cgi/php-src/ext/date/lib/parse_date.re?r1=1.26.2.25&r2=1.26.2.26&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.25 php-src/ext/date/lib/parse_date.re:1.26.2.26 --- php-src/ext/date/lib/parse_date.re:1.26.2.25 Mon Feb 27 19:41:33 2006 +++ php-src/ext/date/lib/parse_date.re Mon Mar 6 21:44:58 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.re,v 1.26.2.25 2006/02/27 19:41:33 derick Exp $ */ +/* $Id: parse_date.re,v 1.26.2.26 2006/03/06 21:44:58 derick Exp $ */ #include "timelib.h" @@ -825,7 +825,7 @@ clf = day "/" monthabbr "/" year4 ":" hour24lz ":" minutelz ":" secondlz space tzcorrection; /* Timestamp format: @1126396800 */ -timestamp = "@" "-"? [1-9] [0-9]*; +timestamp = "@" "-"? [0-9]+; /* To fix some ambiguities */ dateshortwithtimeshort = datenoyear timeshort24;