cvs: php-src /ext/date/lib parse_tz.c /ext/date/tests timezones.phpt

nlopess Fri Sep 1 23:33:13 2006 UTC Modified files: /php-src/ext/date/lib parse_tz.c /php-src/ext/date/tests timezones.phpt Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_tz.c?r1=1.29&r2=1.30&diff_format=u Index: php-src/ext/date/lib/parse_tz.c diff -u php-src/ext/date/lib/parse_tz.c:1.29 php-src/ext/date/lib/parse_tz.c:1.30 --- php-src/ext/date/lib/parse_tz.c:1.29 Fri Sep 1 23:19:56 2006 +++ php-src/ext/date/lib/parse_tz.c Fri Sep 1 23:33:13 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_tz.c,v 1.29 2006/09/01 23:19:56 nlopess Exp $ */ +/* $Id: parse_tz.c,v 1.30 2006/09/01 23:33:13 nlopess Exp $ */ #include "timelib.h" @@ -196,7 +196,7 @@ { int mid, cmp; - if (left >= right) { + if (left > right) { return -1; /* not found */ } @@ -217,7 +217,7 @@ { int pos; - pos = tz_search(timezone, 0, tzdb->index_size, tzdb); + pos = tz_search(timezone, 0, tzdb->index_size - 1, tzdb); if (pos == -1) { return 0; http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/timezones.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/timezones.phpt diff -u /dev/null php-src/ext/date/tests/timezones.phpt:1.2 --- /dev/null Fri Sep 1 23:33:13 2006 +++ php-src/ext/date/tests/timezones.phpt Fri Sep 1 23:33:13 2006 @@ -0,0 +1,26 @@ +--TEST-- +setting bogus timezones +--FILE-- +<?php + +//bogus +var_dump(date_default_timezone_set('AAA')); +var_dump(date_default_timezone_set('ZZZ')); + + +//now the first and the last one +var_dump(date_default_timezone_set("Africa/Abidjan")); +var_dump(date_default_timezone_set("Zulu")); + +echo "done\n"; + +?> +--EXPECTF-- +Notice: date_default_timezone_set(): Timezone ID 'AAA' is invalid in %stimezones.php on line 4 +bool(false) + +Notice: date_default_timezone_set(): Timezone ID 'ZZZ' is invalid in %stimezones.php on line 5 +bool(false) +bool(true) +bool(true) +done