From: Nikita Popov <nikic@php.net>
Date: Sat, 30 Jul 2016 13:54:20 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be836ea4fb874f3221067215b3c3ab227240a3ce;p=php

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

be836ea4fb874f3221067215b3c3ab227240a3ce
diff --cc NEWS
index c024d7ad37,babe2c23b0..52a63f7055
--- a/NEWS
+++ b/NEWS
@@@ -74,6 -127,6 +74,10 @@@ PH
    . Fixed bug #72667 (opendir() with ftp:// attempts to open data stream for
      non-existent directories). (vhuk)
  
++- Wddx:
++  . Fixed bug #72142 (WDDX Packet Injection Vulnerability in
++    wddx_serialize_value()). (Taoguang Chen)
++
  - XMLRPC:
    . Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing
      array elements). (Laruence)