ChangeLog update

diff --git a/ChangeLog b/ChangeLog
index 08fc08de870cccfbbf7e31bf08d74d3d1ef38d9d..4f7e2c5df7a53994f48e468cec19d271d2ada6a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,70 @@
+2008-03-28  Felipe Pena  <felipensp@gmail.com>
+
+    * NEWS:
+      Merged into 5_3
+
+2008-03-28  Nuno Lopes  <nunoplopes@sapo.pt>
+
+    * ext/ldap/tests/.cvsignore
+      ext/standard/tests/class_object/.cvsignore
+      ext/standard/tests/class_object/.cvsignore:
+      ignore generated files
+
+    * ext/ldap/tests/.cvsignore
+      ext/ldap/tests/.cvsignore
+      ext/standard/tests/class_object/.cvsignore:
+      
+      file .cvsignore was initially added on branch PHP_5_3.
+
+2008-03-28  Felipe Pena  <felipensp@gmail.com>
+
+    * ext/imap/php_imap.c
+      ext/imap/php_imap.c:
+      MFB: Fixed bug #44557 (Crash in imap_setacl when supplied integer as
+      username)
+
+    * (PHP_5_2)
+      NEWS
+      ext/imap/php_imap.c:
+      Fixed bug #44557 (Crash in imap_setacl when supplied integer as username)
+      (patch by Thomas Jarosch)
+
+    * (PHP_5_3)
+      ZendEngine2/zend_compile.c
+      ZendEngine2/zend_compile.h
+      ZendEngine2/zend_execute_API.c
+      ZendEngine2/zend_globals.h
+      ZendEngine2/zend_language_parser.y
+      ZendEngine2/zend_language_scanner.c
+      ZendEngine2/zend_language_scanner.l
+      ZendEngine2/zend_language_scanner_defs.h
+      ZendEngine2/zend_opcode.c
+      ZendEngine2/zend_vm_def.h
+      ZendEngine2/zend_vm_execute.h
+      ZendEngine2/zend_vm_opcodes.h
+      ZendEngine2/tests/jump01.phpt
+      ZendEngine2/tests/jump02.phpt
+      ZendEngine2/tests/jump03.phpt
+      ZendEngine2/tests/jump04.phpt
+      ZendEngine2/tests/jump05.phpt
+      ZendEngine2/tests/jump06.phpt
+      ZendEngine2/tests/jump07.phpt
+      ZendEngine2/tests/jump08.phpt
+      ZendEngine2/tests/jump09.phpt
+      ZendEngine2/tests/jump10.phpt
+      ZendEngine2/tests/jump11.phpt
+      ZendEngine2/tests/jump12.phpt
+      ZendEngine2/tests/jump13.phpt
+      ext/standard/url_scanner_ex.c:
+      MFH: Implemented "jump label" operator (limited "goto")
+      [DOC]
+
+2008-03-28  Antony Dovgal  <tony@daylessday.org>
+
+    * (PHP_5_3)
+      ext/standard/url.c:
+      fix compile warnings
+
 2008-03-27  Ilia Alshanetsky  <ilia@prohost.org>
 
     * (PHP_5_2)

diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index cf03883cc458427b830ce78d7ad59b2342276eed..623c2be66a0808b8f83bf08c81f7b7b3a61d9a32 100644 (file)
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,34 @@
+2008-03-28  Felipe Pena  <felipensp@gmail.com>
+
+    * (PHP_5_3)
+      zend_compile.c
+      zend_compile.h
+      zend_execute_API.c
+      zend_globals.h
+      zend_language_parser.y
+      zend_language_scanner.c
+      zend_language_scanner.l
+      zend_language_scanner_defs.h
+      zend_opcode.c
+      zend_vm_def.h
+      zend_vm_execute.h
+      zend_vm_opcodes.h
+      tests/jump01.phpt
+      tests/jump02.phpt
+      tests/jump03.phpt
+      tests/jump04.phpt
+      tests/jump05.phpt
+      tests/jump06.phpt
+      tests/jump07.phpt
+      tests/jump08.phpt
+      tests/jump09.phpt
+      tests/jump10.phpt
+      tests/jump11.phpt
+      tests/jump12.phpt
+      tests/jump13.phpt:
+      MFH: Implemented "jump label" operator (limited "goto")
+      [DOC]
+
 2008-03-27  Antony Dovgal  <tony@daylessday.org>
 
     * .cvsignore: