php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6' into PHP-7.0

Browse Source
This commit is contained in:
Christoph M. Becker
2016-07-28 19:17:56 +02:00
parent 3b48c5a36f 7ab39e2fae
commit 7c412688f4
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+4
View File
@@ -24,6 +24,10 @@ PHP NEWS
(Bob)
. Fixed bug #72683 (getmxrr broken). (Anatol)
- Calendar:
. Fixed bug #67976 (cal_days_month() fails for final month of the French
calendar). (cmb)
- COM:
. Fixed bug #72569 (DOTNET/COM array parameters broke in PHP7). (Anatol)
ext/calendar/calendar.c
+4
View File
@@ -357,6 +357,10 @@ PHP_FUNCTION(cal_days_in_month)
}
else {
sdn_next = calendar->to_jd(year + 1, 1, 1);
if (cal == CAL_FRENCH && sdn_next == 0) {
/* The French calendar ends on 0014-13-05. */
sdn_next = 2380953;
}
}
}
ext/calendar/tests/bug67976.phpt
+12
View File
@@ -0,0 +1,12 @@
--TEST--
Bug #67976 (cal_days_month() fails for final month of the French calendar)
--SKIPIF--
<?php
if (!extension_loaded('calendar')) die('skip ext/calendar required');
?>
--FILE--
<?php
var_dump(cal_days_in_month(CAL_FRENCH, 13, 14));
?>
--EXPECT--
int(5)