iliaa Wed, 05 Jan 2011 14:47:27 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307124
Log:
MFH: Optimize unix timestamp to date-string conversion for very high year values
Changed paths:
U php/php-src/branches/PHP_5_2/ext/date/lib/unixtime2tm.c
A php/php-src/branches/PHP_5_2/ext/date/tests/big_year.phpt
Modified: php/php-src/branches/PHP_5_2/ext/date/lib/unixtime2tm.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/date/lib/unixtime2tm.c 2011-01-05
14:41:50 UTC (rev 307123)
+++ php/php-src/branches/PHP_5_2/ext/date/lib/unixtime2tm.c 2011-01-05
14:47:27 UTC (rev 307124)
@@ -55,6 +55,12 @@
if (ts >= 0) {
tmp_days = days + 1;
+
+ if (tmp_days >= DAYS_PER_LYEAR_PERIOD || tmp_days <=
-DAYS_PER_LYEAR_PERIOD) {
+ cur_year += YEARS_PER_LYEAR_PERIOD * (tmp_days /
DAYS_PER_LYEAR_PERIOD);
+ tmp_days -= DAYS_PER_LYEAR_PERIOD * (tmp_days /
DAYS_PER_LYEAR_PERIOD);
+ }
+
while (tmp_days >= DAYS_PER_LYEAR) {
cur_year++;
if (timelib_is_leap(cur_year)) {
Added: php/php-src/branches/PHP_5_2/ext/date/tests/big_year.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/date/tests/big_year.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/date/tests/big_year.phpt 2011-01-05
14:47:27 UTC (rev 307124)
@@ -0,0 +1,17 @@
+--TEST--
+Handling of large year values
+--SKIPIF--
+<?php echo PHP_INT_SIZE != 8 ? "skip 64-bit only" : "OK"; ?>
+--FILE--
+<?php
+date_default_timezone_set("America/Toronto");
+
+$t = mktime(0,0,0,1,1,292277026596);
+
+var_dump(date("r", $t));
+
+echo "OK\n";
+?>
+--EXPECT--
+string(36) "Fri, 01 Jan 219250468 00:00:00 -0500"
+OK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
