Changeset 389 for branches/1.2/xcache.c

Show
Ignore:
Timestamp:
05/15/2007 07:05:27 AM (19 months ago)
Author:
moo
Message:

merged [388] from trunk->1.2: clean shutdown

Location:
branches/1.2
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2

    • Property svnmerge-integrated changed from /trunk:1-302,344-346,371,374-375 to /trunk:1-302,344-346,371,374-375,388

  • branches/1.2/xcache.c

    r379 r389  
    14491449        xc_cest_t tmp_cest; 
    14501450 
    1451         zend_hash_init_ex(&XG(internal_function_table), 100, NULL, NULL, 1, 0); 
     1451        zend_hash_init_ex(&XG(internal_function_table), 100, NULL, CG(function_table)->pDestructor, 1, 0); 
    14521452        zend_hash_copy(&XG(internal_function_table), CG(function_table), (copy_ctor_func_t) function_add_ref, &tmp_func, sizeof(tmp_func)); 
    14531453 
    1454         zend_hash_init_ex(&XG(internal_class_table), 10, NULL, NULL, 1, 0); 
     1454        zend_hash_init_ex(&XG(internal_class_table), 10, NULL, CG(class_table)->pDestructor, 1, 0); 
    14551455        zend_hash_copy(&XG(internal_class_table), CG(class_table), (copy_ctor_func_t) xc_zend_class_add_ref, &tmp_cest, sizeof(tmp_cest)); 
    14561456    }