ChangeLog update

diff --git a/ChangeLog b/ChangeLog
index f30ce51236084d1ef50fe00568339e3667e281c0..e63a34bfd4bc3b6ff99f55bb1ced29f48c785c49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,78 @@
+2009-05-08  Matt Wilmas  <php_lists@realplain.com>
+
+    * (PHP_5_2)
+      ZendEngine2/zend_compile.c
+      ZendEngine2/zend_highlight.c
+      ZendEngine2/zend_language_scanner.l:
+      MFH: Better fix for bug #42767 (at source instead of workaround); also
+      fixes unclosed comments in tokenizer
+      
+      - Plus minor cleanup of unnecessary code, to match 5.3...
+
+2009-05-08  Hannes Magnusson  <hannes.magnusson@gmail.com>
+
+    * main/streams/userspace.c:
+      MFb5.3: fix comments
+
+2009-05-08  Scott MacVicar  <scott@macvicar.net>
+
+    * ZendEngine2/zend_API.c:
+      PPC machines mark char as unsigned, rather than signed.
+      This caused a segfault when using the T type for zend_parse_parameters
+      because the default value
+      ended up being 255 and never -1
+
+2009-05-08  Hannes Magnusson  <hannes.magnusson@gmail.com>
+
+    * (PHP_5_3)
+      main/streams/userspace.c:
+      Fix comments
+
+2009-05-08  Arnaud Le Blanc  <arnaud.lb@gmail.com>
+
+    * ext/standard/file.c
+      ext/standard/tests/file/file_variation10.phpt:
+      Fix default behavior of file() (FILE_TEXT flag is the default)
+
+    * ext/standard/file.c:
+      Missing check
+
+    * (PHP_5_3)
+      ext/standard/tests/file/bug44034.phpt:
+      test for #44034
+
+    * ext/standard/file.c
+      ext/standard/file.c
+      ext/standard/tests/file/bug44034.phpt
+      ext/standard/tests/file/bug44034.phpt:
+      MFB5.3 fix for bug #44034 (FILE_IGNORE_NEW_LINES in file() does not work as
+      expected when lines end in \r\n) (fixes #48175)
+
+    * ext/standard/tests/file/bug44034.phpt
+      ext/standard/tests/file/bug44034.phpt:
+      
+      file bug44034.phpt was initially added on branch PHP_5_2.
+
+    * (PHP_5_3)
+      ext/standard/file.c:
+      Fix invalid read
+
+2009-05-08  Antony Dovgal  <tony@daylessday.org>
+
+    * ext/sqlite3/sqlite3.c:
+      fix ZTS build
+
+2009-05-08  Brian Shire  <shire@tekrat.com>
+
+    * (PHP_5_3)
+      ext/curl/interface.c:
+      MFH: Add missing #ifdef for curl version that does not have FTP_FILEMETHOD
+      or IPRESOLVE options. related to fix for bug #39637
+
+    * ext/curl/interface.c:
+      Add missing #ifdef for curl version that does not have FTP_FILEMETHOD or
+      IPRESOLVE options. related to fix for bug #39637
+
 2009-05-07  Matteo Beccati  <matteo@beccati.com>
 
     * (PHP_5_3)

diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 0aa2b98ace6135a320d4e6bab8000081f1f9a705..29b02bd9bb4328533cb546fee971ae55963c4883 100644 (file)
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,22 @@
+2009-05-08  Matt Wilmas  <php_lists@realplain.com>
+
+    * (PHP_5_2)
+      zend_compile.c
+      zend_highlight.c
+      zend_language_scanner.l:
+      MFH: Better fix for bug #42767 (at source instead of workaround); also
+      fixes unclosed comments in tokenizer
+      
+      - Plus minor cleanup of unnecessary code, to match 5.3...
+
+2009-05-08  Scott MacVicar  <scott@macvicar.net>
+
+    * zend_API.c:
+      PPC machines mark char as unsigned, rather than signed.
+      This caused a segfault when using the T type for zend_parse_parameters
+      because the default value
+      ended up being 255 and never -1
+
 2009-05-07  Felipe Pena  <felipensp@gmail.com>
 
     * tests/bug47714.phpt