Changeset 162

Timestamp:

02/17/06 18:35:50 (3 years ago)

Author:

zoeloelip

Message:

Merged PHP_5_1 branch with HEAD

Files:

• eaccelerator/trunk/AUTHORS (modified) (1 diff)
• eaccelerator/trunk/ChangeLog (modified) (2 diffs)
• eaccelerator/trunk/Makefile.in (modified) (1 diff)
• eaccelerator/trunk/content.c (modified) (1 diff)
• eaccelerator/trunk/debug.c (modified) (1 diff)
• eaccelerator/trunk/debug.h (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (28 diffs)
• eaccelerator/trunk/ea_restore.h (modified) (1 diff)
• eaccelerator/trunk/ea_store.c (modified) (20 diffs)
• eaccelerator/trunk/eaccelerator.c (modified) (7 diffs)
• eaccelerator/trunk/eaccelerator.h (modified) (3 diffs)
• eaccelerator/trunk/loader.c (modified) (1 diff)
• eaccelerator/trunk/opcodes.c (modified) (9 diffs)
• eaccelerator/trunk/optimize.c (modified) (14 diffs)
• eaccelerator/trunk/webui.c (modified) (12 diffs)

eaccelerator/trunk/AUTHORS

@@ -2 +2 @@
-- Franck Tabary <franck34 at users.sourceforge.net>
-- Bart Vanbrabant <zoeloelip at users.sourceforge.net>
+- Hans Rakers <hrak at users.sourceforge.net>
-
-Inactive member(s) :

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-02-16  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * Merged PHP_5_1 branch with HEAD
+
+2006-02-17  Hans Rakers <hans at parse dot nl>
+
+        * PHP_5_1: Some final fixes before merging to HEAD:
+          - Fixed bug #1410723 (handling of class constants by the optimizer)
+          - Fixed backwards compatibility with PHP < 5.1
+          This revision works pretty well in my testing environment, PHP-5.1 support
+          seems to be coming along quite well. Please test with your applications/
+          in your environment and report back with your experiences or possible problems!
+
-2006-02-15 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-
-        * Released version 0.9.4
+
+2006-02-15  Hans Rakers <hans at parse dot nl>
+
+        * PHP_5_1: Fixes for five failing tests found using the test suite created by Bart
+          Tests that failed where:
+          -ctor_dtor_inheritance (failed because __construct, __destruct and __clone were not properly set)
+          -destructor_and_exceptions (failed because inheritance of parent methods was broken, fixed by making sure ea_store doesn't store methods outside scope)
+          -inheritance_002 (failed because __construct, __destruct and __clone were not properly set)
+          -private_members (failed because __construct, __destruct and __clone were not properly set)
+          -type_hinting_003 (failed because array_type_hint introduced in zend_arg_info in PHP-5.1 was ignored)
+
+2006-02-14  Bart Vanbrabant <bart.vanbrabant at zoeloelip dot be>
+
+        * PHP_5_1: Changed cflags to -O2 from -O3
-
-2006-02-09 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
@@ -21 +48 @@
-        * Updated NEWS and bumped up version to 0.9.4-rc2
-        * Released 0.9.4-rc2
+
+2006-02-07  Hans Rakers <hans at parse dot nl>
+
+        * PHP_5_1: Fix for problems with __autoload
+        * PHP_5_1: Fixed compile problems with thread-safe PHP
+
+2006-02-06  Hans Rakers <hans at parse dot nl>
+
+        * PHP_5_1: Quite some major changes, including but probably not limited to:
+          -Fixed numerous memory leaks
+          -Fixed the handling of empty string variables (as in ""), causing "String is not zero-terminated" warnings when PHP is compiled with --enable-debug
+          -More fixes to the handling of static properties (access checking/inheritance)
+          -Inheritance on restore is now handled by zend_do_inheritance
+          -Fixed handling of ZEND_OP_DATA and ZEND_INIT_METHOD_CALL by the optimizer
+          -Cosmetic fixes (spelling etc.)
+
+2006-01-16  Hans Rakers <hans at parse dot nl>
+
+        * PHP_5_1: Fix for bug #1401474 (and most likely some more php-5.1 related trouble)
+          static_members handling was incorrect.
+
+2006-01-12  Hans Rakers <hans at parse dot nl>
+
+        * First batch of PHP-5.1 related changes committed to the newly created
+          PHP_5_1 branch. This is a work in progress, so YMMV.
-
-2006-01-10 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/Makefile.in

@@ -3 +3 @@
-LTLIBRARY_SHARED_NAME = eaccelerator.la
-
-3
+2
-
-include $(top_srcdir)/build/dynlib.mk

eaccelerator/trunk/content.c

@@ -594 +594 @@
-        eaccelerator_content_cache_place != eaccelerator_none) {
-
+#ifndef ZEND_ENGINE_2_1
+/* Doesn't work with php >= 5.1.0 */
-      /* clean garbage */
-      while (EG(garbage_ptr)) {
-        zval_ptr_dtor(&EG(garbage)[--EG(garbage_ptr)]);
-      }
+#endif
-
-      eaccelerator_put(key, key_len, return_value, ttl, eaccelerator_content_cache_place TSRMLS_CC);

eaccelerator/trunk/debug.c

@@ -291 +291 @@
-}
-
+/*
+ * This dumps a HashTable to debug output. Taken from zend_hash.c and slightly adapted.
+ */
+void ea_debug_hash_display(HashTable * ht)
+{
+        Bucket *p;
+        uint i;
+
+        fprintf(F_fp, "ht->nTableSize: %d\n", ht->nTableSize);
+        fprintf(F_fp, "ht->nNumOfElements: %d\n", ht->nNumOfElements);
+
+        for (i = 0; i < ht->nTableSize; i++) {
+                p = ht->arBuckets[i];
+                while (p != NULL) {
+                        fprintf(F_fp, "%s <==> 0x%lX\n", p->arKey, p->h);
+                        p = p->pNext;
+                }
+        }
+
+        p = ht->pListTail;
+        while (p != NULL) {
+                fprintf(F_fp, "%s <==> 0x%lX\n", p->arKey, p->h);
+                p = p->pListLast;
+        }
+        fflush(F_fp);
+}
+
-#endif /* #ifdef HAVE_EACCELERATOR */

eaccelerator/trunk/debug.h

@@ -72 +72 @@
-long ea_debug_elapsed_time (struct timeval *tvstart);
-
+void ea_debug_hash_display(HashTable * ht);
+
-#endif /* INCLUDED_DEBUG_H */

eaccelerator/trunk/ea_restore.c

@@ -40 +40 @@
-#include "zend_API.h"
-#include "zend_extensions.h"
+#ifdef ZEND_ENGINE_2_1
+#include "zend_vm.h"
+#endif
-
-#ifndef INCOMPLETE_CLASS
@@ -70 +73 @@
-
-        zend_hash_destroy(&dummy_class_entry.default_properties);
+        zend_hash_destroy(&dummy_class_entry.function_table);
+        zend_hash_destroy(&dummy_class_entry.constants_table);
-        zend_hash_destroy(&dummy_class_entry.properties_info);
+#  ifdef ZEND_ENGINE_2_1
+        zend_hash_destroy(&dummy_class_entry.default_static_members);
+#  endif
+#  if defined(ZEND_ENGINE_2) && !defined(ZEND_ENGINE_2_1)
-        zend_hash_destroy(dummy_class_entry.static_members);
-
-
-
-
+
+
-        return property_dtor;
-}
@@ -93 +100 @@
-{
-        FIXUP(from->name);
+#ifdef ZEND_ENGINE_2_1
+        FIXUP(from->doc_comment);
+#endif
-}
-#endif
@@ -222 +232 @@
-                                break;
-                        }
+#  ifdef ZEND_ENGINE_2_1
+                        ZEND_VM_SET_OPCODE_HANDLER(opline);
+#  else
-                        opline->handler = get_opcode_handler(opline->opcode TSRMLS_CC);
+#  endif
+
-#endif
-                }
@@ -235 +250 @@
-                fixup_zval_hash(from->static_variables);
-        }
+#ifdef ZEND_ENGINE_2_1
+        if (from->vars != NULL) {
+                zend_uint i;
+                FIXUP(from->vars);
+                for (i = 0; i < from->last_var; i++) {
+                        FIXUP(from->vars[i].name);
+                }
+        }
+#endif
-        FIXUP(from->filename);
-#ifdef ZEND_ENGINE_2
@@ -252 +276 @@
-        fixup_hash(&from->properties_info,
-                           (fixup_bucket_t) fixup_property_info TSRMLS_CC);
+#  ifdef ZEND_ENGINE_2_1
+        fixup_zval_hash(&from->default_static_members);
+        if (from->static_members != NULL) {
+                FIXUP(from->static_members);
+                if (from->static_members != &from->default_static_members) {
+                        fixup_zval_hash(from->static_members);
+                }
+        }
+#  else
-        if (from->static_members != NULL) {
-                FIXUP(from->static_members);
-                fixup_zval_hash(from->static_members);
-        }
+#  endif
-#else
-        fixup_zval_hash(&from->default_properties);
@@ -278 +312 @@
-        memcpy(p, from, sizeof(zval));
-        restore_zval(p TSRMLS_CC);
+        /* hrak: reset refcount to make sure there is one reference to this val, and prevent memleaks */
+        p->refcount = 1;
-        return p;
-}
@@ -352 +388 @@
-        case IS_STRING:
-                if (zv->value.str.val == NULL || 
-empty_string
+""
-                        zv->value.str.val = empty_string;
-                        return;
@@ -442 +478 @@
-
-        ea_debug_pad(EA_DEBUG TSRMLS_CC);
-
-
+ type=%x
+, from->type
-
-        if (from->type == ZEND_INTERNAL_FUNCTION) {
@@ -500 +536 @@
-        if (from->scope_name != NULL) {
-                char *from_scope_lc = zend_str_tolower_dup(from->scope_name, from->scope_name_len);
-
-
+
-                        ea_debug_pad(EA_DEBUG TSRMLS_CC);
-hash. use EAG(class_entry).\n", getpid(), from_scope_lc
+class_table. use EAG(class_entry).\n", getpid(), from->scope_name
-                        to->scope = EAG(class_entry);
-                } else {
-                        ea_debug_pad(EA_DEBUG TSRMLS_CC);
-_scope_lc
+->scope_name
-                        to->scope = *(zend_class_entry **) to->scope;
-                }
-                efree(from_scope_lc);
-
+ -> hra: no its not :P only if from->scope!=null in ea_store
-                ea_debug_pad(EA_DEBUG TSRMLS_CC);
-                ea_debug_printf(EA_DEBUG, "[%d]                   from is NULL\n", getpid()); 
@@ -563 +598 @@
-                        ea_debug_pad(EA_DEBUG TSRMLS_CC);
-                        ea_debug_printf(EA_DEBUG, "[%d]                                       can't find\n", getpid());
-
+
+
+
+
+
+
+
+
+
+
+
-                return to;
-        }
+#ifdef ZEND_ENGINE_2
+        /* hrak: slight memleak here. dont forget to free the lowercase function name! */
+        if (fname_lc != NULL) {
+                efree(fname_lc);
+        }
+#endif
-        to->opcodes = from->opcodes;
-        to->last = to->size = from->last;
@@ -571 +622 @@
-        to->brk_cont_array = from->brk_cont_array;
-        to->last_brk_cont = from->last_brk_cont;
-/*
+
-           to->current_brk_cont = -1;
-           to->static_variables = from->static_variables;
-
+
-           to->backpatch_count  = 0;
- */
+
-        to->return_reference = from->return_reference;
-        to->done_pass_two = 1;
-        to->filename = from->filename;
+/*      if (from->filename != NULL) {
+                size_t len = strlen(from->filename) + 1;
+                to->filename = emalloc(len);
+                memcpy(to->filename, from->filename, len);
+        }*/
+
-#ifdef ZEND_ENGINE_2
-        /* HOESH: try & catch support */
@@ -613 +670 @@
-        }
-
+#ifdef ZEND_ENGINE_2_1
+        to->vars             = from->vars;
+        to->last_var         = from->last_var;
+        to->size_var         = 0;
+/*      if (from->vars) {
+                zend_uint i;
+                to->vars = (zend_compiled_variable*)emalloc(from->last_var*sizeof(zend_compiled_variable));             
+                memcpy(to->vars, from->vars, sizeof(zend_compiled_variable) * from->last_var);
+                for (i = 0; i < from->last_var; i ++) {
+                        to->vars[i].name = estrndup(from->vars[i].name, from->vars[i].name_len);
+                }
+        }*/
+#endif
+
-        /* disable deletion in destroy_op_array */
-        ++EAG(refcount_helper);
@@ -634 +705 @@
-        to->name = emalloc(from->name_length + 1);
-        memcpy(to->name, from->name, from->name_length + 1);
+#ifdef ZEND_ENGINE_2_1
+        if (from->doc_comment != NULL) {
+                to->doc_comment = emalloc(from->doc_comment_len+1);
+                memcpy(to->doc_comment, from->doc_comment, from->doc_comment_len+1);
+        }
+#endif
-        return to;
-}
@@ -642 +719 @@
-                                                  zend_class_entry * to TSRMLS_DC)
-{
-
-
-
+
+
+
+
+
+
-#else
-        if (zend_hash_find(CG(class_table), (void *) parent, len + 1, (void **) &to->parent) != SUCCESS)
@@ -655 +735 @@
-#ifdef ZEND_ENGINE_2
-                /* inherit parent methods */
-
+
+
+
+
-                to->constructor = to->parent->constructor;
-                to->destructor = to->parent->destructor;
-                to->clone = to->parent->clone;
-
+/*
-                to->__set = to->parent->__set;
+#  ifdef ZEND_ENGINE_2_1
+                to->__unset = to->parent->__unset;
+                to->__isset = to->parent->__isset;
+                to->serialize_func = to->parent->serialize_func;
+                to->unserialize_func = to->parent->unserialize_func;
+#  endif
-                to->__call = to->parent->__call;
-                to->create_object = to->parent->create_object;
@@ -666 +755 @@
-                to->handle_property_get = to->parent->handle_property_get;
-                to->handle_property_set = to->parent->handle_property_set;
-
-
-
-
-efree(name_lc);
+*/
+
+
+
+/*efree(name_lc);*/
-#endif
-}
@@ -689 +778 @@
-                fname_len = strlen(f->common.function_name);
-                fname_lc = zend_str_tolower_dup(f->common.function_name, fname_len);
+                ea_debug_printf(EA_DEBUG, "restore_class_methods: restoring function:%s scope:%s parent=%x scope=%x\n", fname_lc, ZEND_FN_SCOPE_NAME(f), to->parent, f->common.scope);
-
-                if (fname_len == cname_len && !memcmp(fname_lc, cname_lc, fname_len) && 
@@ -709 +799 @@
-                                         memcmp(fname_lc, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)) == 0)
-                                to->__set = f;
+#  ifdef ZEND_ENGINE_2_1
+                        else if (fname_len == sizeof(ZEND_UNSET_FUNC_NAME) - 1 &&
+                                        memcmp(fname_lc, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)) == 0)
+                                to->__unset = f;
+                        else if (fname_len == sizeof(ZEND_ISSET_FUNC_NAME) - 1 &&
+                                        memcmp(fname_lc, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)) == 0)
+                                to->__isset = f;
+#  endif
-                        else if (fname_len == sizeof(ZEND_CALL_FUNC_NAME) - 1 &&
-                                         memcmp(fname_lc, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)) == 0)
@@ -725 +823 @@
-        zend_class_entry *old;
-        zend_function *f = NULL;
-
-
-
-
-
+
+ */
+
+
+ */
-        Bucket *p;
-        union _zend_function *old_ctor;
@@ -735 +833 @@
-
-        ea_debug_pad(EA_DEBUG TSRMLS_CC);
-
+s
-#ifdef DEBUG
-        EAG(xpad)++;
-#endif
-
-        if (to == NULL) {
-                to = emalloc(sizeof(zend_class_entry));
@@ -753 +850 @@
-#ifdef ZEND_ENGINE_2
-        to->ce_flags = from->ce_flags;
-        /*
-           to->static_members = NULL;
-         */
-        to->num_interfaces = from->num_interfaces;
-        if (to->num_interfaces > 0) {
+                /* hrak: Allocate the slots which will later be populated by ZEND_ADD_INTERFACE */
-                to->interfaces = (zend_class_entry **) emalloc(sizeof(zend_class_entry *) * to->num_interfaces);
-                // should find out class entry. what the hell !!!
-                memset(to->interfaces, 0, sizeof(zend_class_entry *) * to->num_interfaces);
-        } else {
@@ -766 +860 @@
-
-        to->iterator_funcs = from->iterator_funcs;
+        to->create_object = from->create_object;
-        to->get_iterator = from->get_iterator;
-        to->interface_gets_implemented = from->interface_gets_implemented;
@@ -776 +871 @@
-        }
-
-        if (from->parent != NULL) {
-                restore_class_parent(from->parent, strlen(from->parent), to TSRMLS_CC);
-        } else {
-                ea_debug_pad(EA_DEBUG TSRMLS_CC);
-                ea_debug_printf(EA_DEBUG, "[%d] parent = NULL\n", getpid());
-                to->parent = NULL;
-        }
-
-        old = EAG(class_entry);
-        EAG(class_entry) = to;
@@ -793 +880 @@
-        to->line_end = from->line_end;
-        to->doc_comment_len = from->doc_comment_len;
-
+/*
-                size_t len = strlen(from->filename) + 1;
-                to->filename = emalloc(len);
-                memcpy(to->filename, from->filename, len);
-
+
+
-        if (from->doc_comment != NULL) {
-                to->doc_comment = emalloc(from->doc_comment_len + 1);
@@ -814 +902 @@
-        to->properties_info.pDestructor = properties_info_dtor;
-
+#  ifdef ZEND_ENGINE_2_1
+        /* restore default_static_members */
+        restore_zval_hash(&to->default_static_members, &from->default_static_members);
+        to->default_static_members.pDestructor = ZVAL_PTR_DTOR;
+        
+        ea_debug_printf(EA_DEBUG, "restore_class_entry: static_members=%x, default_static_members=%x\n", from->static_members, &from->default_static_members);
+        if (from->static_members != &(from->default_static_members)) {
+                ALLOC_HASHTABLE(to->static_members);
+                restore_zval_hash(to->static_members, from->static_members);
+                to->static_members->pDestructor = ZVAL_PTR_DTOR;
+        } else {
+                to->static_members = &(to->default_static_members);
+        }
+        ea_debug_printf(EA_DEBUG, "restore_class_entry: to->static_members=%x, to->default_static_members=%x\n", to->static_members, &to->default_static_members);
+#  else
-        if (from->static_members != NULL) {
-                ALLOC_HASHTABLE(to->static_members);
-                restore_zval_hash(to->static_members, from->static_members);
-                to->static_members->pDestructor = ZVAL_PTR_DTOR;
-
-
-
-
-
-
+
+
-#else
-        to->refcount = emalloc(sizeof(*to->refcount));
@@ -839 +938 @@
-        }
-#endif
+        if (from->parent != NULL) {
+                restore_class_parent(from->parent, strlen(from->parent), to TSRMLS_CC);
+        } else {
+                ea_debug_pad(EA_DEBUG TSRMLS_CC);
+                ea_debug_printf(EA_DEBUG, "[%d] parent = NULL\n", getpid());
+                to->parent = NULL;
+        }
+
-        restore_hash(&to->function_table, &from->function_table,
-                                 (restore_bucket_t) restore_op_array_ptr TSRMLS_CC);
@@ -846 +953 @@
-        restore_class_methods(to TSRMLS_CC);
-#endif
+        if (to->parent)
+                zend_do_inheritance(to, to->parent TSRMLS_CC);
-        EAG(class_entry) = old;
-

eaccelerator/trunk/ea_restore.h

@@ -35 +35 @@
-void fixup_class_entry (eaccelerator_class_entry * from TSRMLS_DC);
-
+void restore_zval(zval * zv TSRMLS_DC);
-void restore_class(mm_fc_entry *p TSRMLS_DC);
-void restore_function(mm_fc_entry *p TSRMLS_DC);

eaccelerator/trunk/ea_store.c

@@ -83 +83 @@
-        EAG(mem) += sizeof(zend_property_info);
-        calc_string(from->name, from->name_length + 1 TSRMLS_CC);
+#ifdef ZEND_ENGINE_2_1
+        if (from->doc_comment != NULL) {
+                calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
+        }
+#endif
-}
-
@@ -118 +123 @@
-        case IS_CONSTANT:
-        case IS_STRING:
-               if (zv->value.str.val == NULL || zv->value.str.val == empty_string
-
+/*             if (zv->value.str.val == NULL
+*/
-                        calc_string(zv->value.str.val, zv->value.str.len + 1 TSRMLS_CC);
-
+
-                break;
-        case IS_ARRAY:
@@ -247 +252 @@
-                calc_zval_hash(from->static_variables);
-        }
+#ifdef ZEND_ENGINE_2_1
+        if (from->vars != NULL) {
+                zend_uint i;
+                EACCELERATOR_ALIGN(EAG(mem));
+                EAG(mem) += sizeof(zend_compiled_variable) * from->last_var;
+                for (i = 0; i < from->last_var; i ++) {
+                        calc_string(from->vars[i].name, from->vars[i].name_len+1 TSRMLS_CC);
+                }
+        }
+#endif
-        if (from->filename != NULL)
-                calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC);
@@ -270 +285 @@
-                calc_string(from->parent->name, from->parent->name_length + 1 TSRMLS_CC);
-#ifdef ZEND_ENGINE_2
-#if 0
-        // what's problem. why from->interfaces[i] == 0x5a5a5a5a ?
-        for (i = 0; i < from->num_interfaces; i++) {
-                if (from->interfaces[i]) {
-                        calc_string(from->interfaces[i]->name,
-                                                from->interfaces[i]->name_length);
-                }
-        }
-#endif
-        if (from->filename != NULL)
-                calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC);
@@ -286 +292 @@
-        calc_zval_hash(&from->constants_table);
-        calc_zval_hash(&from->default_properties);
+
-        calc_hash(&from->properties_info, (calc_bucket_t) calc_property_info);
+
+#  ifdef ZEND_ENGINE_2_1
+        calc_zval_hash(&from->default_static_members);
+        if ((from->static_members != NULL) && (from->static_members != &from->default_static_members)) {
+#  else
-        if (from->static_members != NULL) {
+#  endif
-                EACCELERATOR_ALIGN(EAG(mem));
-                EAG(mem) += sizeof(HashTable);
@@ -368 +381 @@
-
-typedef void *(*store_bucket_t) (void *TSRMLS_DC);
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-#define store_zval_hash(to, from) \
-
+, NULL, NULL
-
-#define store_zval_hash_ex(to, from, start) \
-
+, NULL
-
-static zval *store_zval_ptr(zval * from TSRMLS_DC)
@@ -393 +407 @@
-
-static void store_hash_int(HashTable * target, HashTable * source,
-
+
+
-{
-        Bucket *p, *np, *prev_p;
+        TSRMLS_FETCH();
-
-        memcpy(target, source, sizeof(HashTable));
@@ -416 +432 @@
-                np = NULL;
-                while (p) {
+                        /* If a check function has been defined, run it */
+                        if (check_bucket) {
+                                va_list args;
+                                va_start(args, check_bucket);
+
+                                /* If the check function returns ZEND_HASH_APPLY_REMOVE, don't store this record, skip over it */
+                                if(check_bucket(p, args)) {
+                                        p = p->pListNext;
+                                        target->nNumOfElements--;
+                                        /* skip to next itteration */
+                                        continue;
+                                }
+                                va_end(args);
+                        }
+
-                        EACCELERATOR_ALIGN(EAG(mem));
-                        np = (Bucket *) EAG(mem);
@@ -466 +497 @@
-        case IS_CONSTANT:
-        case IS_STRING:
-
-
-
-
-
-
-
+
-                break;
-        case IS_ARRAY:
@@ -516 +541 @@
-
-        ea_debug_pad(EA_DEBUG TSRMLS_CC);
-
+ type=%x
-            getpid(), from->function_name ? from->function_name : "(top)",
-#ifdef ZEND_ENGINE_2
@@ -523 +548 @@
-                        "NULL"
-#endif
+                        , from->type
-                );
-
@@ -555 +581 @@
-                                to->arg_info[i].class_name_len = from->arg_info[i].class_name_len;
-                        }
+#  ifdef ZEND_ENGINE_2_1
+                        /* php 5.1 introduces this in zend_arg_info for array type hinting */
+                        to->arg_info[i].array_type_hint = from->arg_info[i].array_type_hint;
+#  endif
-                        to->arg_info[i].allow_null = from->arg_info[i].allow_null;
-                        to->arg_info[i].pass_by_reference = from->arg_info[i].pass_by_reference;
@@ -595 +625 @@
-#endif
-
-
-
+
+
+
+
+
+
+
-    
-        to->opcodes = from->opcodes;
@@ -672 +707 @@
-                store_zval_hash(to->static_variables, from->static_variables);
-        }
+#ifdef ZEND_ENGINE_2_1
+        if (from->vars != NULL) {
+                zend_uint i;
+                EACCELERATOR_ALIGN(EAG(mem));
+                to->last_var = from->last_var;
+                to->vars = (zend_compiled_variable*)EAG(mem);
+                EAG(mem) += sizeof(zend_compiled_variable) * from->last_var;
+                        memcpy(to->vars, from->vars, sizeof(zend_compiled_variable) * from->last_var);
+                for (i = 0; i < from->last_var; i ++) {
+                        to->vars[i].name = store_string(from->vars[i].name, from->vars[i].name_len+1 TSRMLS_CC);
+                }
+        } else {
+                to->last_var = 0;
+                to->vars = NULL;
+        }
+#endif
-        if (from->filename != NULL) {
-to
+from
-        }
-#ifdef ZEND_ENGINE_2
@@ -694 +745 @@
-        memcpy(to, from, sizeof(zend_property_info));
-        to->name = store_string(from->name, from->name_length + 1 TSRMLS_CC);
+#ifdef ZEND_ENGINE_2_1
+        to->doc_comment_len = from->doc_comment_len;
+        if (from->doc_comment != NULL) {
+                to->doc_comment = store_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC);
+        }
+#endif
-        return to;
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+