Changeset 18
- Timestamp:
- 12/18/04 15:34:06 (4 years ago)
- Files:
-
- eaccelerator/trunk/eaccelerator.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
eaccelerator/trunk/eaccelerator.c
r17 r18 2440 2440 to->function_name = from->function_name; 2441 2441 2442 #ifdef ZEND_ENGINE_2 2443 2442 2444 int fname_len; 2443 2445 char *fname_lc; … … 2448 2450 fname_lc = zend_str_tolower_dup(to->function_name, fname_len); 2449 2451 } 2450 #ifdef ZEND_ENGINE_2 2452 2451 2453 to->fn_flags = from->fn_flags; 2452 2454 … … 2624 2626 ce->parent != NULL && 2625 2627 zend_hash_find(&ce->parent->function_table, 2628 #ifdef ZEND_ENGINE_2 2626 2629 fname_lc, fname_len+1, 2630 #else 2631 to->function_name, strlen(to->function_name)+1, 2632 #endif 2627 2633 (void **) &function)==SUCCESS && 2628 2634 function->type == ZEND_INTERNAL_FUNCTION) … … 2763 2769 { 2764 2770 int name_len = strlen(from->parent); 2771 #ifdef ZEND_ENGINE_2 2765 2772 char *name_lc = zend_str_tolower_dup(from->parent, name_len); 2766 2773 2767 2774 if (zend_hash_find(CG(class_table), (void *)name_lc, name_len+1, (void **)&to->parent) != SUCCESS) 2768 { 2775 #else 2776 if (zend_hash_find(CG(class_table), (void *)from->parent, name_len+1, (void **)&to->parent) != SUCCESS) 2777 #endif 2778 { 2769 2779 debug_printf("[%d] EACCELERATOR can't restore parent class " 2770 2780 "\"%s\" of class \"%s\"\n", getpid(), (char*)from->parent, to->name); … … 2791 2801 to->__call = to->parent->__call; 2792 2802 to->create_object = to->parent->create_object; 2803 } 2804 efree(name_lc); 2793 2805 #else 2794 2806 to->handle_property_get = to->parent->handle_property_get; 2795 2807 to->handle_property_set = to->parent->handle_property_set; 2796 2808 to->handle_function_call = to->parent->handle_function_call; 2797 #endif 2798 } 2799 efree(name_lc); 2809 } 2810 #endif 2800 2811 } 2801 2812 else