From b19c520142c27815aa304c57f4353634669a7ea5 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Fri, 22 Jul 2005 05:39:31 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 13 +++++++++++++
 Zend/ChangeLog | 10 ++++++++++
 2 files changed, 23 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index eb911dfc5f..110e0f524b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-07-21  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * ZendEngine2/zend_execute_API.c:
+      - Fix error generation logic (found by johannes)
+
+2005-07-21  Dmitry Stogov  <dmitry@zend.com>
+
+    * ZendEngine2/zend_vm_def.h:
+      Fixed bug with returning from internal function by reference
+
+    * ext/standard/var.c:
+      Recursion protection
+
 2005-07-20  Jani Taskinen  <jani.taskinen@sci.fi>
 
     * NEWS:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index c7cd23c0a8..d07ab61ca4 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-21  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_execute_API.c:
+      - Fix error generation logic (found by johannes)
+
+2005-07-21  Dmitry Stogov  <dmitry@zend.com>
+
+    * zend_vm_def.h:
+      Fixed bug with returning from internal function by reference
+
 2005-07-19  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
 
     * zend_interfaces.c:
-- 
2.50.1