From 2bf81c4a3ffacbf3bd087d92d96de08a6a022cce Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Tue, 22 Nov 2005 06:48:55 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 41 +++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog |  6 ++++++
 2 files changed, 47 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0257d48761..0434d81504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2005-11-21  Rui Hirokawa  <rui_hirokawa@ybb.ne.jp>
+
+    * (PHP_4_4)
+      ext/mbstring/mbstring.c:
+      fixed #35307 unexpected header can be injected to mb_send_mail() (the patch
+      is made by masugata).
+
+2005-11-21  Jani Taskinen  <jani.taskinen@sci.fi>
+
+    * (PHP_5_1)
+      Makefile.global
+      acinclude.m4
+      configure.in
+      ext/standard/config.m4
+      scripts/Makefile.frag
+      scripts/php-config.in
+      scripts/phpize.m4:
+      MFH: - Fixed header installing under phpize builds
+
+    * Makefile.global
+      acinclude.m4
+      configure.in
+      ext/standard/config.m4
+      scripts/Makefile.frag
+      scripts/php-config.in
+      scripts/phpize.m4:
+      - Fixed header installing under phpize builds
+
+2005-11-21  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * (PHP_5_1)
+      ZendEngine2/zend_language_scanner.l:
+      - MFH Fixed Bug #35286 tokenizer ext drops final comment (by greg)
+
+2005-11-21  Jani Taskinen  <jani.taskinen@sci.fi>
+
+    * (PHP_5_1)
+      ext/ldap/config.m4
+      ext/odbc/config.m4:
+      test -e does not work with solaris
+
 2005-11-20  Derick Rethans  <php@derickrethans.nl>
 
     * ext/standard/microtime.c:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 9b069630e9..6954ef10ef 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-21  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * (PHP_5_1)
+      zend_language_scanner.l:
+      - MFH Fixed Bug #35286 tokenizer ext drops final comment (by greg)
+
 2005-11-19  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
 
     * zend_language_scanner.l:
-- 
2.50.1