ChangeLog update

diff --git a/ChangeLog b/ChangeLog
index a3ed205305f3d2ba3628ece800acd255b04f6b48..c3cae6ef69a10a3bc4b25ca875cda3ff7229ceda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2009-05-30  Arnaud Le Blanc  <arnaud.lb@gmail.com>
+
+    * (PHP_5_2)
+      NEWS
+      NEWS:
+      BFN
+
+    * (PHP_5_2)
+      ZendEngine2/zend_alloc.c
+      ZendEngine2/zend_alloc.c:
+      MFH: Take small blocks cache into account in memory_get_usage()
+
+    * ZendEngine2/zend_alloc.c:
+      Take small blocks cache into account in memory_get_usage()
+
+    * (PHP_5_2)
+      ZendEngine2/zend_vm_def.h
+      ZendEngine2/zend_vm_def.h
+      ZendEngine2/zend_vm_execute.h
+      ZendEngine2/zend_vm_execute.h:
+      MFH: Fix aliasing issue (fixes #48409 , #48428 , #48228)
+
+    * ZendEngine2/zend_vm_def.h
+      ZendEngine2/zend_vm_execute.h:
+      Fix aliasing issue (fixes #48409 , #48428 , #48228)
+
+2009-05-30  Scott MacVicar  <scott@macvicar.net>
+
+    * (PHP_5_3)
+      main/main.c:
+      MFH: Make sure the timeout is checked in the shutdown function, patch from
+      Etienne
+
+    * main/main.c:
+      Make sure the timeout is checked in the shutdown function, patch from
+      Etienne
+
 2009-05-29  Ulf Wendel  <ulf.wendel@phpdoc.de>
 
     * (PHP_5_3)

diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 8e2a69b6e867345dc11b5a5774433c30b4df1162..b8e97e6d5fb158cd0618c85373613ba2e97a96c3 100644 (file)
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,24 @@
+2009-05-30  Arnaud Le Blanc  <arnaud.lb@gmail.com>
+
+    * (PHP_5_2)
+      zend_alloc.c
+      zend_alloc.c:
+      MFH: Take small blocks cache into account in memory_get_usage()
+
+    * zend_alloc.c:
+      Take small blocks cache into account in memory_get_usage()
+
+    * (PHP_5_2)
+      zend_vm_def.h
+      zend_vm_def.h
+      zend_vm_execute.h
+      zend_vm_execute.h:
+      MFH: Fix aliasing issue (fixes #48409 , #48428 , #48228)
+
+    * zend_vm_def.h
+      zend_vm_execute.h:
+      Fix aliasing issue (fixes #48409 , #48428 , #48228)
+
 2009-05-29  Pierre-Alain Joye  <pierre.dev@gmail.com>
 
     * tests/bug42143.phpt: