From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 2 Aug 2017 16:49:48 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0beta3~56^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4988e83fe94b7977188476f12846d8b3263893d7;p=php

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

4988e83fe94b7977188476f12846d8b3263893d7
diff --cc NEWS
index 23779913e9,6abb2815da..a8c8ba4feb
--- a/NEWS
+++ b/NEWS
@@@ -49,11 -44,13 +49,15 @@@ PH
  
  - SPL:
    . Fixed bug #74669 (Unserialize ArrayIterator broken). (Andrew Nester)
 +  . Fixed bug #74977 (Appending AppendIterator leads to segfault). 
 +    (Andrew Nester)
    . Fixed bug #75015 (Crash in recursive iterator destructors). (Julien)
  
+ - XMLRPC:
+   . Fixed bug #74975 (Incorrect xmlrpc serialization for classes with declared
+     properties). (blar)
+ 
 -03 Aug 2017 PHP 7.0.22
 +03 Aug 2017, PHP 7.1.8
  
  - Core:
    . Fixed bug #74832 (Loading PHP extension with already registered function