com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/mbstring/mbstring.c
| From: | Christoph Michael Becker | Date: | Tue, 30 Aug 2016 13:12:49 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94162@lists.php.net to get a copy of this message | ||
Commit: ecdef60d000210f4d22e95de4209db73a0c8344f
Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 30 Aug 2016 15:02:14 +0200
Parents: 3d66d56c1d0d1185851eeefacfb4ffb581ce8a24 972302d2f0bb12689db280df8a3daadb0d5003b3
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ecdef60d000210f4d22e95de4209db73a0c8344f
Log:
Merge branch 'PHP-7.0' into PHP-7.1
Changed paths:
MM NEWS
MM ext/mbstring/mbstring.c
Diff:
diff --cc NEWS
index ec64fc5,36b01a3..9743a32
--- 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)