com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/spl/spl_array.c
| From: | Adam Harvey | Date: | Thu, 29 May 2014 17:53:28 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/spl/spl_array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78635@lists.php.net to get a copy of this message | ||
Commit: 43e3a83d51ac82dd3b08c545bf57b9090cf07dd3
Author: Adam Harvey <aharvey@php.net> Thu, 29 May 2014 17:53:28 +0000
Parents: 4ef561c7bacd76d3221237e52cfcbcef257c9ee7 b5d9983ff4373793621ee4b21d4964b30c5d21c8
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43e3a83d51ac82dd3b08c545bf57b9090cf07dd3
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
Changed paths:
MM NEWS
MM ext/spl/spl_array.c
Diff:
diff --cc NEWS
index ed7b782,354a796..9ba1dd8
--- a/NEWS
+++ b/NEWS
@@@ -6,16 -6,10 +6,19 @@@ PH
. Fixed bug #67308 (Serialize of DateTime truncates fractions of second).
(Adam)
+- OPCache:
+ . Fixed issue #183 (TMP_VAR is not only used once). (Dmitry, Laruence)
+
+- PDO-ODBC:
+ . Fixed bug #50444 (PDO-ODBC changes for 64-bit).
+
+ - SPL:
+ . Fixed bug #67360 (Missing element after ArrayObject::getIterator). (Adam)
+
-?? ??? 2014, PHP 5.4.29
+29 May 2014, PHP 5.5.13
+
+- CLI server:
+ . Fixed bug #67079 (Missing MIME types for XML/XSL files). (Anatol)
- COM:
. Fixed bug #66431 (Special Character via COM Interface (CP_UTF8)). (Anatol)