From 24fd4059bbcd927773cdba0c62701b1b4d83478c Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Tue, 3 Feb 2009 01:32:30 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 15 +++++++++
 2 files changed, 103 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ce7459af08..c529d03e73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,91 @@
+2009-02-02  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_2)
+      NEWS
+      ext/filter/logical_filters.c
+      ext/filter/logical_filters.c
+      ext/filter/tests/016.phpt
+      ext/filter/tests/016.phpt:
+      
+      MFB: Fixed bug #47282 (FILTER_VALIDATE_EMAIL is marking valid email
+      addresses as invalid)
+
+    * (PHP_5_3)
+      ext/filter/logical_filters.c
+      ext/filter/tests/016.phpt:
+      
+      Fixed bug #47282 (FILTER_VALIDATE_EMAIL is marking valid email addresses
+      as
+      invalid)
+
+2009-02-02  Nuno Lopes  <nunoplopes@sapo.pt>
+
+    * ZendEngine2/zend_ini_scanner.c
+      ZendEngine2/zend_ini_scanner.c
+      ZendEngine2/zend_ini_scanner_defs.h
+      ZendEngine2/zend_ini_scanner_defs.h:
+      regenerate
+
+    * ZendEngine2/zend_ini_scanner.l
+      ext/standard/tests/file/bug46347.phpt:
+      MFB: fix #46347
+
+    * ext/standard/tests/file/bug46347.phpt
+      ext/standard/tests/file/bug46347.phpt:
+      
+      file bug46347.phpt was initially added on branch PHP_5_3.
+
+    * (PHP_5_3)
+      NEWS
+      ZendEngine2/zend_ini_scanner.l:
+      fix bug #46347: allow * in ini keys
+
+2009-02-02  Felipe Pena  <felipensp@gmail.com>
+
+    * (PHP_5_2)
+      ext/soap/soap.c
+      ext/soap/soap.c:
+      - MFH: Fixed bug #47269 (Typo: SoapSlient instead of SoapClient)
+
+    * ext/soap/soap.c:
+      - Fixed bug #47269 (Typo: SoapSlient instead of SoapClient)
+
+2009-02-02  Pierre-Alain Joye  <pierre.dev@gmail.com>
+
+    * win32/build/config.w32.h.in
+      win32/build/config.w32.h.in:
+      - define HAVE_SOCKLEN_T as it exists (vc6+)
+
+    * main/streams/php_stream_transport.h
+      main/streams/php_stream_transport.h:
+      - silent compiler warning about socklen_t benign redefinition
+
+    * (PHP_5_3)
+      sapi/apache_hooks/php_apache.c:
+      - MFH: fix build (use the same arginfo than the aliased func)
+
+    * sapi/apache_hooks/php_apache.c:
+      - fix build (use the same arginfo than the aliased func)
+
+2009-02-02  Moriyoshi Koizumi  <mozo@mozo.jp>
+
+    * (PHP_5_2)
+      NEWS
+      ext/mbstring/libmbfl/filters/mbfilter_cp936.c
+      ext/mbstring/libmbfl/filters/mbfilter_cp936.c
+      ext/mbstring/tests/bug46843.phpt
+      ext/mbstring/tests/bug46843.phpt:
+      - MFH: Fix bug #46843 (CP936 euro symbol is not converted properly)
+
+    * ext/mbstring/tests/bug46843.phpt
+      ext/mbstring/tests/bug46843.phpt
+      ext/mbstring/tests/bug46843.phpt:
+        1.1.4;
+      * Forgot to add the test.
+
+    * ext/mbstring/libmbfl/filters/mbfilter_cp936.c:
+      - Fix bug #46843 (CP936 euro symbol is not converted properly)
+
 2009-02-01  David Soria Parra  <dsoria@gmx.net>
 
     * configure.in:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 1330a33181..4c8b1f11a1 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,18 @@
+2009-02-02  Nuno Lopes  <nunoplopes@sapo.pt>
+
+    * zend_ini_scanner.c
+      zend_ini_scanner.c
+      zend_ini_scanner_defs.h
+      zend_ini_scanner_defs.h:
+      regenerate
+
+    * zend_ini_scanner.l:
+      MFB: fix #46347
+
+    * (PHP_5_3)
+      zend_ini_scanner.l:
+      fix bug #46347: allow * in ini keys
+
 2009-01-28  Nuno Lopes  <nunoplopes@sapo.pt>
 
     * zend_stream.c:
-- 
2.50.1