cvs: php-src /ext/date php_date.c /ext/date/lib parse_date.c parse_date.re

derick Mon Mar 6 21:43:35 2006 UTC Modified files: /php-src/ext/date php_date.c /php-src/ext/date/lib parse_date.c parse_date.re Log: - Fixed bug #36638 (strtotime unconditional false return on now <= 0) http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.86&r2=1.87&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.86 php-src/ext/date/php_date.c:1.87 --- php-src/ext/date/php_date.c:1.86 Fri Mar 3 07:54:36 2006 +++ php-src/ext/date/php_date.c Mon Mar 6 21:43:34 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.86 2006/03/03 07:54:36 derick Exp $ */ +/* $Id: php_date.c,v 1.87 2006/03/06 21:43:34 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -949,7 +949,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.59&r2=1.60&diff_format=u Index: php-src/ext/date/lib/parse_date.c diff -u php-src/ext/date/lib/parse_date.c:1.59 php-src/ext/date/lib/parse_date.c:1.60 --- php-src/ext/date/lib/parse_date.c:1.59 Mon Feb 27 19:39:21 2006 +++ php-src/ext/date/lib/parse_date.c Mon Mar 6 21:43:34 2006 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.12 on Mon Feb 27 20:38:29 2006 */ +/* Generated by re2c 0.9.12 on Mon Mar 6 22:41:59 2006 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.c,v 1.59 2006/02/27 19:39:21 derick Exp $ */ +/* $Id: parse_date.c,v 1.60 2006/03/06 21:43:34 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.52&r2=1.53&diff_format=u Index: php-src/ext/date/lib/parse_date.re diff -u php-src/ext/date/lib/parse_date.re:1.52 php-src/ext/date/lib/parse_date.re:1.53 --- php-src/ext/date/lib/parse_date.re:1.52 Mon Feb 27 19:39:21 2006 +++ php-src/ext/date/lib/parse_date.re Mon Mar 6 21:43:35 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.re,v 1.52 2006/02/27 19:39:21 derick Exp $ */ +/* $Id: parse_date.re,v 1.53 2006/03/06 21:43:35 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;