ChangeLog update

diff --git a/ChangeLog b/ChangeLog
index 8d097b5a9f7e7c098ffa7bc43caf733245ab8a16..73cc508f9e467b604aea606fd4fd552950a2a865 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2007-01-15  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * main/php_streams.h
+      main/streams/cast.c
+      main/streams/streams.c:
+      - Help streams debugging
+
+2007-01-15  Antony Dovgal  <antony@zend.com>
+
+    * ext/standard/user_filters.c
+      main/streams/streams.c
+      main/streams/transports.c
+      main/streams/userspace.c:
+      add trailing '\0' to stream hashes
+
+    * (PHP_5_2)
+      main/streams/filter.c:
+      revert the patch temporarily, I need to test a bigger patch in HEAD..
+
+    * main/streams/filter.c:
+      include \0 to the hash
+      it does matter because we use these strings in phpinfo()
+
+    * acinclude.m4:
+      tabs -> ws
+
+    * acinclude.m4:
+      improve icu-config check
+
+    * ZendEngine2/tests/bug36214.phpt
+      ZendEngine2/tests/bug36214.phpt:
+      fix test
+
+    * (PHP_5_2)
+      ZendEngine2/zend_compile.c:
+      missing comma
+
+    * (PHP_5_2)
+      ZendEngine2/zend_compile.c:
+      fix error message and #40111
+
+2007-01-15  Frank M. Kromann  <frank@kromann.info>
+
+    * (PHP_5_2)
+      ext/pdo_dblib/dblib_stmt.c:
+      Fix mysql -> dblib
+
 2007-01-14  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
 
     * main/streams/memory.c:

diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 3a9ef298481e8f18c87c8a1b605be5f406657ea3..0f8f607dc96d02a06d70004aaf7822da708e60df 100644 (file)
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,17 @@
+2007-01-15  Antony Dovgal  <antony@zend.com>
+
+    * tests/bug36214.phpt
+      tests/bug36214.phpt:
+      fix test
+
+    * (PHP_5_2)
+      zend_compile.c:
+      missing comma
+
+    * (PHP_5_2)
+      zend_compile.c:
+      fix error message and #40111
+
 2007-01-11  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
 
     * zend_API.h