]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Sat, 30 Jul 2016 13:54:20 +0000 (15:54 +0200)
committerNikita Popov <nikic@php.net>
Sat, 30 Jul 2016 13:55:00 +0000 (15:55 +0200)
1  2 
NEWS
ext/wddx/wddx.c

diff --cc NEWS
index c024d7ad3707c4a005859d9a23447606b5d608fd,babe2c23b0bf985848a32834938704f359b66aa0..52a63f7055af8d8b78d284d4e4ff72e0f1cb01b5
--- 1/NEWS
--- 2/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)
diff --cc ext/wddx/wddx.c
Simple merge