From: Christoph M. Becker <cmb@php.net>
Date: Thu, 28 Jul 2016 17:24:18 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28ade0e102b52159800c2f58b6081e0eb16df8b5;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

28ade0e102b52159800c2f58b6081e0eb16df8b5
diff --cc NEWS
index 55258ed69e,9ed4bb8b82..9a7d0c4d2b
--- a/NEWS
+++ b/NEWS
@@@ -7,8 -20,17 +7,12 @@@ PH
      phpize). (Yuji Uchiyama)
    . Fixed bug #72641 (phpize (on Windows) ignores PHP_PREFIX).
      (Yuji Uchiyama)
 -  . Fixed potential segfault in object storage freeing in shutdown sequence.
 -    (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)
 -
  - CURL:
    . Fixed bug #71709 (curl_setopt segfault with empty CURLOPT_HTTPHEADER).
      (Pierrick)