Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66942: openssl_seal() memory leak
  ws fix

Conflicts:
	ext/openssl/openssl.c

diff --cc NEWS
index f571b560eef8e542a9761323bd7e10f1405a8fe3,6caf4c41d77d5befa0c63357229a68f89c4996f7..0c155d85e819b27533012a7229ad2e23f3e41685
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -35,10 -37,13 +35,17 @@@ PH
    . Fixed bug #66021 (Blank line inside empty array/object when
      JSON_PRETTY_PRINT is set). (Kevin Israel)
  
+ - LDAP:
+   . Fixed issue with null bytes in LDAP bindings. (Matthew Daley)
+ 
 +- mysqli:
 +  . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter
 +    (extra comma) and third parameters (lack of escaping). (Andrey)
 +
+ - OpenSSL:
+   . Fix bug #66942 (memory leak in openssl_seal()). (Chuan Ma)
+   . Fix bug #66952 (memory leak in openssl_open()). (Chuan Ma)
+ 
  - SimpleXML:
    . Fixed bug #66084 (simplexml_load_string() mangles empty node name)
      (Anatol)

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

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