- MFH: Fixed bug #46732 (mktime.year description is wrong).

php · Dec 2, 2008 · 7a28b87 · 7a28b87
1 parent 1c3d201
commit 7a28b87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -1433,7 +1433,7 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 		case 6:
 			if (yea >= 0 && yea < 70) {
 				yea += 2000;
-			} else if (yea >= 70 && yea <= 110) {
+			} else if (yea >= 70 && yea <= 100) {
 				yea += 1900;
 			}
 			now->y = yea;

diff --git a/ext/date/tests/mktime-3-64bit.phpt b/ext/date/tests/mktime-3-64bit.phpt
@@ -7,7 +7,7 @@ error_reporting=2047
 --FILE--
 <?php
 $tzs = array("America/Toronto", "Europe/Oslo");
-$years = array(0, 69, 70, 71, 99, 100, 105, 1900, 1901, 1902, 1999, 2000, 2001);
+$years = array(0, 69, 70, 71, 99, 100, 101, 105, 110, 1900, 1901, 1902, 1999, 2000, 2001);
 
 foreach ($tzs as $tz) {
 	echo $tz, "\n";
@@ -32,7 +32,9 @@ Y:   70 - January 1970-01-01T01:01:01-0500
 Y:   71 - January 1971-01-01T01:01:01-0500
 Y:   99 - January 1999-01-01T01:01:01-0500
 Y:  100 - January 2000-01-01T01:01:01-0500
-Y:  105 - January 2005-01-01T01:01:01-0500
+Y:  101 - January 0101-01-01T01:01:01-0500
+Y:  105 - January 0105-01-01T01:01:01-0500
+Y:  110 - January 0110-01-01T01:01:01-0500
 Y: 1900 - January 1900-01-01T01:01:01-0500
 Y: 1901 - January 1901-01-01T01:01:01-0500
 Y: 1902 - January 1902-01-01T01:01:01-0500
@@ -47,7 +49,9 @@ Y:   70 - January 1970-01-01T01:01:01+0100
 Y:   71 - January 1971-01-01T01:01:01+0100
 Y:   99 - January 1999-01-01T01:01:01+0100
 Y:  100 - January 2000-01-01T01:01:01+0100
-Y:  105 - January 2005-01-01T01:01:01+0100
+Y:  101 - January 0101-01-01T01:01:01+0100
+Y:  105 - January 0105-01-01T01:01:01+0100
+Y:  110 - January 0110-01-01T01:01:01+0100
 Y: 1900 - January 1900-01-01T01:01:01+0100
 Y: 1901 - January 1901-01-01T01:01:01+0100
 Y: 1902 - January 1902-01-01T01:01:01+0100