From: Stanislav Malyshev <stas@php.net>
Date: Mon, 14 Apr 2014 20:36:25 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~377^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6adc84a701797c22888d33478b7591337c476c01;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

6adc84a701797c22888d33478b7591337c476c01
diff --cc NEWS
index d4311c61cc,0c155d85e8..a5d06dcde0
--- a/NEWS
+++ b/NEWS
@@@ -31,12 -35,20 +31,19 @@@ 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)
 +- mysqlnd:
 +  . Added a new fetching mode to mysqlnd. (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)
 +- PDO:
 +  . Fixed bug #66604 ('pdo/php_pdo_error.h' not copied to the include dir).
 +    (Matteo)
  
  - SQLite:
    . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol)