From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 3 Mar 2013 17:58:42 +0000 (-0500)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~12^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c596850af6d278b283aaf5b90026d23b348d5fe7;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS
---

c596850af6d278b283aaf5b90026d23b348d5fe7
diff --cc NEWS
index b75c0524cb,7d0d2b64c6..d6e40de4e1
--- a/NEWS
+++ b/NEWS
@@@ -32,34 -14,37 +32,46 @@@ PH
  - CLI server:
    . Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi)
  
 -- Mbstring:
 -  . mb_split() can now handle empty matches like preg_split() does. (Moriyoshi)
 +- cURL:
 +  . Implemented FR #46439 - added CURLFile for safer file uploads.
 +    (Stas)
 +
 +- Intl:
 +  . Cherry-picked UConverter wrapper, which had accidentaly been committed only
 +    to master.
  
 -- OpenSSL:
 -  . Fixed bug #61930 (openssl corrupts ssl key resource when using 
 -    openssl_get_publickey()). (Stas)
 +- mysqli
 +  . Added mysqli_begin_transaction()/mysqli::begin_transaction(). Implemented
 +    all options, per MySQL 5.6, which can be used with START TRANSACTION, COMMIT
 +	and ROLLBACK through options to mysqli_commit()/mysqli_rollback() and their
 +	respective OO counterparts. They work in libmysql and mysqlnd mode. (Andrey)
 +  . Added mysqli_savepoint(), mysqli_release_savepoint(). (Andrey)
  
 -- PDO_mysql:
 -  . Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs).
 -    (Johannes)
 +- mysqlnd
 +  . Add new begin_transaction() call to the connection object. Implemented all
 +    options, per MySQL 5.6, which can be used with START TRANSACTION, COMMIT
 +	and ROLLBACK. (Andrey)
 +  . Added mysqlnd_savepoint(), mysqlnd_release_savepoint(). (Andrey)
  
 -- Phar:
 -  . Fixed timestamp update on Phar contents modification. (Dmitry)
 +- Sockets:
 +  . Added recvmsg() and sendmsg() wrappers. (Gustavo)
 +    See https://wiki.php.net/rfc/sendrecvmsg
  
 -- SOAP
 -  . Added check that soap.wsdl_cache_dir conforms to open_basedir
 -    (CVE-2013-1635). (Dmitry)
 -  . Disabled external entities loading (CVE-2013-1643). (Dmitry)
 +- Filter:
 +  . Implemented FR #49180 - added MAC address validation. (Martin)
  
+ - Phar:
+   . Fixed timestamp update on Phar contents modification. (Dmitry)
+ 
+ - SPL:
+   . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence)
+   . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
+     (patch by kriss@krizalys.com, Laruence)
+   . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended). 
+     (Nikita Popov)
+   . Fixed bug #52861 (unset fails with ArrayObject and deep arrays).
+     (Mike Willbanks)
+ 
  - SNMP:
    . Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin)