From: Joe Watkins <krakjoe@php.net>
Date: Sat, 12 Nov 2016 17:35:24 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~947^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d865dfd358eb61174c2cedd9ed18d1e0872b840;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  news entry for calendar overflow fix
  Fix integer overflow in calender.
---

2d865dfd358eb61174c2cedd9ed18d1e0872b840
diff --cc NEWS
index 798897da5d,22e1bfa4d4..8aeb463c9f
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,10 +1,13 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2016 PHP 7.0.14
 +?? ??? ????, PHP 7.1
 +
 +
 +10 Nov 2016, PHP 7.1.0RC6
  
+ - Calendar:
+   . Fix integer overflows (Joshua Rogers)
+ 
  - Core:
    . Fixded bug #72736 (Slow performance when fetching large dataset with mysqli
      / PDO). (Dmitry)