com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/standard/var.c
| From: | Nikita Popov | Date: | Sun, 01 Jan 2017 18:26:36 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/standard/var.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96502@lists.php.net to get a copy of this message | ||
Commit: 70ca40d30fae08dc442a40e128bd9c3aa2e67808
Author: Nikita Popov <nikic@php.net> Sun, 1 Jan 2017 19:25:52 +0100
Parents: 876b7b177f5622d5065185a2c3277fa1576e6d79 4877641962a7ad77fd3d1dac0b59de37a52659a1
Branches: PHP-7.1
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=70ca40d30fae08dc442a40e128bd9c3aa2e67808
Log:
Merge branch 'PHP-7.0' into PHP-7.1
Changed paths:
MM NEWS
MM ext/standard/var.c
Diff:
diff --cc NEWS
index 699d05c,db6c897...3673c94
--- a/NEWS
+++ b/NEWS
@@@ -57,9 -47,9 +57,10 @@@ PH
parameter). (Bruce Weirdan)
. Fixed bug #70213 (Unserialize context shared on double class lookup).
(Taoguang Chen)
+ . Fixed bug #73154 (serialize object with __sleep function crash). (Nikita)
+ . Add subject to mail log. (tomsommer)
-- Zlib:
+- Zlib
. Fixed bug #73373 (deflate_add does not verify that output was not truncated).
(Matt Bonneau)