From: Stanislav Malyshev <stas@php.net>
Date: Mon, 14 Apr 2014 20:35:00 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bc82718aecf60696d2d0a9517403f8a282e3573;p=php

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
---

8bc82718aecf60696d2d0a9517403f8a282e3573
diff --cc NEWS
index f571b560ee,6caf4c41d7..0c155d85e8
--- a/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)