From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 31 Jul 2013 12:34:26 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~366^2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35872e101be0c4931b54b8ad94ba055c7aeee434;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
	NEWS
---

35872e101be0c4931b54b8ad94ba055c7aeee434
diff --cc NEWS
index 19e33d84ca,d480e3d669..78f6539f83
--- a/NEWS
+++ b/NEWS
@@@ -9,31 -6,23 +9,34 @@@ PH
    . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
    . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
      limited case). (Arpad)
 -  . Improve fix for bug #63186 (compile failure on netbsd). (Matteo)
  
 -- Session:
 -  . Fixed bug #62129 (rfc1867 crashes php even though turned off). (gxd305 at
 -    gmail dot com)
 -  . Fixed bug #50308 (session id not appended properly for empty anchor tags).
 -    (Arpad)
 +- OPcahce:
 +  . Added opcache.restrict_api configuration directive that may limit
 +    usage of OPcahce API functions only to patricular script(s). (Dmitry)
 +  . Added support for glob symbols in blacklist entries (?, *, **).
 +    (Terry Elison, Dmitry)
 +  . Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on
 +    shutdown). (Dmitry)
 +
 +- PDO_mysql:
 +  . Fixed bug #65299 (pdo mysql parsing errors). (Johannes)
 +
 +- Phar:
 +  . Fixed bug #65028 (Phar::buildFromDirectory creates corrupt archives for 
 +    some specific contents). (Stas)
  
+ - SOAP:
+   . Fixed bug #65018 (SoapHeader problems with SoapServer). (Dmitry)
+ 
  - SPL:
    . Fixed bug #65328 (Segfault when getting SplStack object Value). (Laruence)
 +  . Added RecursiveTreeIterator setPostfix and getPostifx methods. (Joshua 
 +    Thijssen)
 +  . Fixed bug #61697 (spl_autoload_functions returns lambda functions 
 +    incorrectly). (Laruence)
  
 -- Phar:
 -  . Fixed bug #65028 (Phar::buildFromDirectory creates corrupt archives for 
 -    some specific contents). (Stas)
 +- Streams:
 +  . Fixed bug #65268 (select() implementation uses outdated tick API). (Anatol)
  
  - Pgsql:
    . Fixed bug #65336 (pg_escape_literal/identifier() scilently returns false).