From: Tjerk Meesters <datibbaw@php.net>
Date: Thu, 25 Jun 2015 22:03:29 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.1.0alpha3~25^2~175^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03a670eaaa2b89f7b98b62908502ac5736dac2eb;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
---

03a670eaaa2b89f7b98b62908502ac5736dac2eb
diff --cc NEWS
index ac8e5c1c76,77b26c20df..62107c1b40
--- a/NEWS
+++ b/NEWS
@@@ -1,30 -1,21 +1,34 @@@
 -PHP                                                                        NEWS
 +PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? Jul 2015, PHP 5.6.12
 +09 Jul 2015, PHP 7.0.0 Beta 1
 +
 +- Core:
 +  . Fixed bug #69768 (escapeshell*() doesn't cater to !). (cmb)
 +
 +- PCRE:
 +  . Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the
 +    string). (cmb)
  
+ - OpenSSL:
 -  . Fixed bug #69882 (OpenSSL error “key values mismatch” after 
++  . Fixed bug #69882 (OpenSSL error “key values mismatch” after
+     openssl_pkcs12_read with extra cert) (Tomasz Sawicki)
+ 
 -09 Jul 2015, PHP 5.6.11
 +25 Jun 2015, PHP 7.0.0 Alpha 2
  
  - Core:
 -  . Fixed bug #69768 (escapeshell*() doesn't cater to !). (cmb)
 -  . Fixed bug #69703 (Use __builtin_clzl on PowerPC).
 -    (dja at axtens dot net, Kalle)
 -  . Fixed bug #69732 (can induce segmentation fault with basic php code).
 -    (Dmitry)
 -  . Fixed bug #69642 (Windows 10 reported as Windows 8).
 -    (Christian Wenz, Anatol Belski)
 +  . Fixed bug #69872 (uninitialised value in strtr with array). (Laruence)
 +  . Fixed bug #69868 (Invalid read of size 1 in zend_compile_short_circuiting).
 +    (Laruence)
 +  . Fixed bug #69849 (Broken output of apache_request_headers). (Kalle)
 +  . Fixed bug #69840 (iconv_substr() doesn't work with UTF-16BE). (Kalle)
 +  . Fixed bug #69823 (PHP 7.0.0alpha1 segmentation fault when exactly 33
 +    extensions are loaded). (Laruence)
 +  . Fixed bug #69805 (null ptr deref and seg fault in zend_resolve_class_name).
 +    (Laruence)
 +  . Fixed bug #69802 (Reflection on Closure::__invoke borks type hint class
 +    name). (Dmitry)
 +  . Fixed bug #69761 (Serialization of anonymous classes should be prevented).
 +    (Laruence)
    . Fixed bug #69551 (parse_ini_file() and parse_ini_string() segmentation
      fault). (Christoph M. Becker)
    . Fixed bug #69781 (phpinfo() reports Professional Editions of Windows