ChangeLog update

diff --git a/ChangeLog b/ChangeLog
index a23b7fadf408cb313cebd669774a6bf6a031f96e..468e228cbdbb92b7d04f1eb23411f98152b83b3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2005-01-02  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_4_3)
+      NEWS
+      NEWS
+      Zend/zend_highlight.c
+      ZendEngine2/zend_highlight.c:
+      MFH: Fixed bug #31371 (highlight_file() trims new line after heredoc).
+
+    * ZendEngine2/zend_highlight.c:
+      Fixed bug #31371 (highlight_file() trims new line after heredoc).
+
+2005-01-02  Rob Richards  <rrichards@ctindustries.net>
+
+    * ext/dom/document.c:
+      allow parser flags to be passed to xinclude()
+
+    * (PHP_5_0)
+      NEWS:
+      BFN
+
+2005-01-02  Moriyoshi Koizumi  <moriyoshi@at.wakwak.com>
+
+    * (PHP_4_3)
+      ext/standard/tests/array/bug29493.phpt
+      ext/standard/tests/array/bug29493.phpt
+      ext/standard/tests/array/bug31213.phpt
+      ext/standard/tests/array/bug31213.phpt:
+      - MFH: add testcases for bug #29493 and #31213.
+
+    * ext/standard/tests/array/bug29493.phpt
+      ext/standard/tests/array/bug31213.phpt:
+        1.1.4;
+      - Add testcases for bug #29493 and #31213.
+
 2005-01-01  Wez Furlong  <wez.php@thebrainroom.net>
 
     * (PHP_5_0)

diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 502114e50383a5150010db563c1939c8cd8ee885..2b101356398d8ec468e9c6d770ebe7c30b8fee6e 100644 (file)
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-02  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_0)
+      zend_highlight.c:
+      MFH: Fixed bug #31371 (highlight_file() trims new line after heredoc).
+
+    * zend_highlight.c:
+      Fixed bug #31371 (highlight_file() trims new line after heredoc).
+
 2004-12-30  Jani Taskinen  <jani.taskinen@kolumbus.fi>
 
     * (PHP_5_0)