ChangeLog update

diff --git a/ChangeLog b/ChangeLog
index 522ef711b7f5b1df11168383bbe9e4e11d943d93..a7482f9b5fbc6df188259c74bb168bd6f2963a68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,102 @@
+2008-12-24  Scott MacVicar  <scott@macvicar.net>
+
+    * (PHP_5_3)
+      ext/sqlite3/php_sqlite3_structs.h
+      ext/sqlite3/sqlite3.c
+      ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt:
+      MFH Stop using sqlite3_aggregate_count() as this is now deprecated.
+
+    * ext/sqlite3/php_sqlite3_structs.h
+      ext/sqlite3/sqlite3.c
+      ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt:
+      Stop using sqlite3_aggregate_count() as this is now deprecated.
+
+    * (PHP_5_3)
+      NEWS:
+      BFN
+
+    * (PHP_5_3)
+      ext/json/json.c:
+      MFH Make sure we clear out the error when the scalar version decoding
+      works.
+
+    * ext/json/json.c:
+      Make sure we clear out the error when the scalar version decoding works.
+
+    * (PHP_5_3)
+      ZendEngine2/zend_ini_scanner.c
+      ZendEngine2/zend_ini_scanner.l
+      ZendEngine2/zend_ini_scanner_defs.h:
+      MFH Fix bug #45991 - UTF-8 BOM breaks ini parser
+
+    * ZendEngine2/zend_ini_scanner.c
+      ZendEngine2/zend_ini_scanner.l
+      ZendEngine2/zend_ini_scanner_defs.h:
+      Fix bug #45991 - UTF-8 BOM breaks ini parser
+
+2008-12-24  Felipe Pena  <felipensp@gmail.com>
+
+    * (PHP_5_2)
+      ext/imap/php_imap.c
+      ext/imap/php_imap.c:
+      - MFH: Fixed memory leak in imap_rfc822_parse_adrlist
+
+    * ext/imap/php_imap.c:
+      - Fixed memory leak in imap_rfc822_parse_adrlist
+
+    * (PHP_5_2)
+      ext/imap/tests/bug46918.phpt
+      ext/imap/tests/bug46918.phpt:
+      - New test
+
+    * ext/imap/tests/bug46918.phpt
+      ext/imap/tests/bug46918.phpt
+      ext/imap/tests/bug46918.phpt:
+        1.1.4;
+      - New test
+
+    * (PHP_5_2)
+      NEWS:
+      BFN
+
+    * (PHP_5_2)
+      ext/imap/php_imap.c:
+      - Fixed bug #46918 (imap_rfc822_parse_adrlist host part not filled in
+      correctly) [only in this branch]
+
+2008-12-24  Pierre-Alain Joye  <pierre.dev@gmail.com>
+
+    * (PHP_5_3)
+      ext/zip/php_zip.h:
+      - version and WS
+
+2008-12-24  Felipe Pena  <felipensp@gmail.com>
+
+    * NEWS
+      NEWS:
+      - Merged into 5.3
+
+    * (PHP_5_3)
+      ext/sysvshm/php_sysvshm.h
+      ext/sysvshm/sysvshm.c
+      ext/sysvshm/tests/002.phpt
+      ext/sysvshm/tests/003.phpt
+      ext/sysvshm/tests/004.phpt
+      ext/sysvshm/tests/005.phpt
+      ext/sysvshm/tests/006.phpt
+      ext/sysvshm/tests/007.phpt:
+      - Sync code with HEAD
+      - [DOC] Backported: shm_has_var()
+
+    * ext/sysvshm/sysvshm.c
+      ext/sysvshm/tests/002.phpt
+      ext/sysvshm/tests/003.phpt
+      ext/sysvshm/tests/004.phpt
+      ext/sysvshm/tests/005.phpt
+      ext/sysvshm/tests/006.phpt
+      ext/sysvshm/tests/007.phpt:
+      - Standard
+
 2008-12-23  Sanjay Mantoor  <smantoor@in.ibm.com>
 
     * (PHP_5_2)

diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 53ece02971debc3141c97d8b3ead61f0a5b112bc..9de5bfdc36d301ba821244901bfb3ee9d97fd5bb 100644 (file)
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,16 @@
+2008-12-24  Scott MacVicar  <scott@macvicar.net>
+
+    * (PHP_5_3)
+      zend_ini_scanner.c
+      zend_ini_scanner.l
+      zend_ini_scanner_defs.h:
+      MFH Fix bug #45991 - UTF-8 BOM breaks ini parser
+
+    * zend_ini_scanner.c
+      zend_ini_scanner.l
+      zend_ini_scanner_defs.h:
+      Fix bug #45991 - UTF-8 BOM breaks ini parser
+
 2008-12-22  Etienne Kneuss  <php@colder.ch>
 
     * (PHP_5_3)