Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix missing type checks in various functions

diff --cc NEWS
index 5b50256f2d620a12bdc9777e027053d80d1b81b0,97c9ae285245d173bbfb4d085eb272576287894a..ec794468eb0d4ff350b21d5083823a8d09bd6aa3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,18 -1,28 +1,27 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.4.32
 +?? ??? 2014, PHP 5.5.16
  
 -- Readline:
+ - COM:
+   . Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).
+ 
 +- FPM:
 +  . Fixed bug #67635 (php links to systemd libraries without using pkg-config).
 +    (pacho@gentoo.org, Remi)
 +
 +- 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
      with control-c). (Dmitry Saprykin, Johannes)
  
- ?? ??? 2014, PHP 5.5.15
+ - Sessions:
+   . Fixed missing type checks in php_session_create_id (Yussuf Khalil, Stas).
+ 
 -- SPL:
 -  . Fixed bug #67539 (ArrayIterator use-after-free due to object change during
 -    sorting). (research at insighti dot org, Laruence)
 -  . Fixed bug #67538 (SPL Iterators use-after-free). (CVE-2014-4670) (Laruence)
 -
+ - OpenSSL:
+   . Fixed missing type checks in OpenSSL options (Yussuf Khalil, Stas).
+ 
 -24 Jul 2014, PHP 5.4.31
++24 Jul 2014, PHP 5.5.15
  
  - Core:
    . Fixed bug #67428 (header('Location: foo') will override a 308-399 response

diff --cc ext/openssl/openssl.c
Simple merge

diff --cc ext/session/session.c
Simple merge