Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67716 - Segfault in cdf.c

diff --cc NEWS
index ac3937a77135e9dc78d9348905132236fc45ee9a,1339ba8b42ccaf876cd9c61dc82e575640938b62..e6a87e64c69db541bd4599a94f8c88de56fac6a2
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -6,17 -6,13 +6,17 @@@ PH
    . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
  
  - OpenSSL:
-   . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads)
+   . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads).
      (Daniel Lowrey).
  
 +- SPL:
 +  . Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException
 +    wrong message). (tim_siebels_aurich at yahoo dot de)
 +
  - Date:
-   . Fixed bug #66091 (memory leaks in DateTime constructor) (Tjerk).
+   . Fixed bug #66091 (memory leaks in DateTime constructor). (Tjerk).
  
 -?? ??? 2014, PHP 5.4.32
 +?? ??? 2014, PHP 5.5.16
  
  - COM:
    . Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).
@@@ -25,23 -21,20 +25,24 @@@
  
  - Fileinfo:
    . Fixed bug #67705 (extensive backtracking in rule regular expression).
 -    (CVE-2014-3538). (Remi)
 +    (CVE-2014-3538) (Remi)
+   . Fixed bug #67716 (Segfault in cdf.c). (CVE-2014-3587) (Remi)
  
 +- FPM:
 +  . Fixed bug #67635 (php links to systemd libraries without using pkg-config).
 +    (pacho@gentoo.org, Remi)
 +
  - GD:
    . Fixed bug #66901 (php-gd 'c_color' NULL pointer dereference).
 -    (CVE-2014-2497). (Remi)
 +    (CVE-2014-2497) (Remi)
  
  - Milter:
    . Fixed bug #67715 (php-milter does not build and crashes randomly). (Mike)
 -
 +  
  - OpenSSL:
--  . Fixed missing type checks in OpenSSL options (Yussuf Khalil, Stas).
++  . Fixed missing type checks in OpenSSL options. (Yussuf Khalil, Stas)
  
 -- Readline:
 +- readline:
    . Fixed bug #55496 (Interactive mode doesn't force a newline before the
      prompt). (Bob, Johannes)
    . Fixed bug #67496 (Save command history when exiting interactive shell