From: Adam Harvey <aharvey@php.net>
Date: Thu, 9 Sep 2010 06:41:23 +0000 (+0000)
Subject: Fixed bug #52744 (cal_days_in_month incorrect for December 1 BCE). Original
X-Git-Tag: php-5.3.4RC1~258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97f6da74a1b5d2baebf26b2b48d078f1f5ce3dd3;p=php

Fixed bug #52744 (cal_days_in_month incorrect for December 1 BCE). Original
patch by gpap at internet dot gr.
---

diff --git a/NEWS b/NEWS
index 9cba2bdb63..e52246a6f1 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@
 
 - Fixed bug #52786 (PHP should reset section to [PHP] after ini sections).
   (Fedora at famillecollet dot com)
+- Fixed bug #52744 (cal_days_in_month incorrect for December 1 BCE).
+  (gpap at internet dot gr, Adam)
 - Fixed bug #52725 (gcc builtin atomic functions were sometimes used when they
   were not available). (fat)
 - Fixed bug #52745 (Binding params doesn't work when selecting a date inside a
diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index 54f2658eea..6eb2d31bef 100644
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@ -348,8 +348,15 @@ PHP_FUNCTION(cal_days_in_month)
 	sdn_next = calendar->to_jd(year, 1 + month, 1);
 
 	if (sdn_next == 0) {
-/* if invalid, try first month of the next year... */
-		sdn_next = calendar->to_jd(year + 1, 1, 1);
+		/* If the next month is invalid, then we need to try the first month of
+		 * the next year, bearing in mind that the next year after 1 BCE is
+		 * actually 1 AD and not 0. */
+		if (year == -1) {
+			sdn_next = calendar->to_jd(1, 1, 1);
+		}
+		else {
+			sdn_next = calendar->to_jd(year + 1, 1, 1);
+		}
 	}
 
 	RETURN_LONG(sdn_next - sdn_start);
diff --git a/ext/calendar/tests/bug52744.phpt b/ext/calendar/tests/bug52744.phpt
new file mode 100644
index 0000000000..886086a294
--- /dev/null
+++ b/ext/calendar/tests/bug52744.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #52744 (cal_days_in_month incorrect for December 1 BCE)
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+var_dump(cal_days_in_month(CAL_GREGORIAN, 12, -1));
+var_dump(cal_days_in_month(CAL_JULIAN, 12, -1));
+?>
+--EXPECT--
+int(31)
+int(31)