Merge branch 'PHP-5.4' into PHP-5.5

Conflicts: NEWS
2024-11-28 12:26:37 +08:00 · 2013-03-03 12:58:42 -05:00 · 2013-03-03 12:58:42 -05:00 · c596850af6
commit c596850af6
parent 46e612ada4 a3f020a4be
2 changed files with 796 additions and 661 deletions
--- a/12
+++ b/12
@ -60,6 +60,18 @@ PHP                                                                        NEWS
 - 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)

--- a/ext/date/lib/timezonedb.h
+++ b/ext/date/lib/timezonedb.h