From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 30 Aug 2016 13:02:14 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecdef60d000210f4d22e95de4209db73a0c8344f;p=php

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

ecdef60d000210f4d22e95de4209db73a0c8344f
diff --cc NEWS
index ec64fc53da,36b01a3453..9743a32188
--- a/NEWS
+++ b/NEWS
@@@ -31,11 -53,10 +31,14 @@@ PH
    . Fixed bug #65732 (grapheme_*() is not Unicode compliant on CR LF
      sequence). (cmb)
  
 -- OCI8
 -  . Fixed invalid handle error with Implicit Result Sets. (Chris Jones)
 -  . Fixed bug #72524 (Binding null values triggers ORA-24816 error). (Chris Jones)
 +- JSON:
 +  . Implemented earlier return when json_encode fails, fixes bugs #68992
 +    (Stacking exceptions thrown by JsonSerializable) and #70275 (On recursion
 +    error, json_encode can eat up all system memory). (Jakub Zelenka)
 +
++- mbstring:
++  . Fixed bug #66797 (mb_substr only takes 32-bit signed integer). (cmb)
+ 
  - Opcache:
    . Fixed bug #72949 (Typo in opcache error message). (cmb)