com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/calendar/calendar.c

From: Date: Thu, 28 Jul 2016 23:26:15 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/calendar/calendar.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93466@lists.php.net to get a copy of this message
Commit: 293dd3d7017e3df8f06898d3a7d1c00eb935ee0c Author: Christoph M. Becker <cmb@php.net> Fri, 29 Jul 2016 01:12:12 +0200 Parents: a952aac6a751b2ea9c015590a1c4597f86762bce f67ccd4a7b8fb4b9e55796e69b152e2a899ba3cd Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=293dd3d7017e3df8f06898d3a7d1c00eb935ee0c Log: Merge branch 'PHP-5.6' into PHP-7.0 # Resolved conflicts: # ext/calendar/calendar.c Changed paths: MM NEWS MM ext/calendar/calendar.c Diff: diff --cc NEWS index 9ed4bb8,48a78c8..cb66a0b --- a/NEWS +++ b/NEWS @@@ -27,14 -14,14 +27,16 @@@ PH - Calendar: . Fixed bug #67976 (cal_days_month() fails for final month of the French calendar). (cmb) + . Fixed bug #71894 (AddressSanitizer: global-buffer-overflow in + zif_cal_from_jd). (cmb) -- Curl: - . Fixed bug #71144 (Segmentation fault when using cURL with ZTS). - (maroszek at gmx dot net) - . Fixed bug #71929 (Certification information (CERTINFO) data parsing error). +- COM: + .. Fixed bug #72569 (DOTNET/COM array parameters broke in PHP7). (Anatol) + +- CURL: + . Fixed bug #71709 (curl_setopt segfault with empty CURLOPT_HTTPHEADER). (Pierrick) + . Fixed bug #71929 (CURLINFO_CERTINFO data parsing error). (Pierrick) - DOM: . Fixed bug #66502 (DOM document dangling reference). (Sean Heelan, cmb) diff --cc ext/calendar/calendar.c index 2e0f53e,fd48760..40ae249 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@@ -418,18 -420,24 +418,24 @@@ PHP_FUNCTION(cal_from_jd add_assoc_long(return_value, "year", year); /* day of week */ - dow = DayOfWeek(jd); - add_assoc_long(return_value, "dow", dow); - add_assoc_string(return_value, "abbrevdayname", DayNameShort[dow]); - add_assoc_string(return_value, "dayname", DayNameLong[dow]); + if (cal != CAL_JEWISH || year > 0) { + dow = DayOfWeek(jd); + add_assoc_long(return_value, "dow", dow); - add_assoc_string(return_value, "abbrevdayname", DayNameShort[dow], 1); - add_assoc_string(return_value, "dayname", DayNameLong[dow], 1); ++ add_assoc_string(return_value, "abbrevdayname", DayNameShort[dow]); ++ add_assoc_string(return_value, "dayname", DayNameLong[dow]); + } else { + add_assoc_null(return_value, "dow"); - add_assoc_string(return_value, "abbrevdayname", "", 1); - add_assoc_string(return_value, "dayname", "", 1); ++ add_assoc_string(return_value, "abbrevdayname", ""); ++ add_assoc_string(return_value, "dayname", ""); + } /* month name */ if(cal == CAL_JEWISH) { /* special case for Jewish calendar */ - add_assoc_string(return_value, "abbrevmonth", JEWISH_MONTH_NAME(year)[month]); - add_assoc_string(return_value, "monthname", JEWISH_MONTH_NAME(year)[month]); - add_assoc_string(return_value, "abbrevmonth", (year > 0 ? JEWISH_MONTH_NAME(year)[month] : ""), 1); - add_assoc_string(return_value, "monthname", (year > 0 ? JEWISH_MONTH_NAME(year)[month] : ""), 1); ++ add_assoc_string(return_value, "abbrevmonth", (year > 0 ? JEWISH_MONTH_NAME(year)[month] : "")); ++ add_assoc_string(return_value, "monthname", (year > 0 ? JEWISH_MONTH_NAME(year)[month] : "")); } else { - add_assoc_string(return_value, "abbrevmonth", calendar->month_name_short[month], 1); - add_assoc_string(return_value, "monthname", calendar->month_name_long[month], 1); + add_assoc_string(return_value, "abbrevmonth", calendar->month_name_short[month]); + add_assoc_string(return_value, "monthname", calendar->month_name_long[month]); } } /* }}} */

« previous php.cvs (#93466) next »