Changeset 429

Timestamp:

06/22/2007 05:11:06 PM (5 years ago)

Author:

moo

Message:

refix #101, apache1 segv with non-zts php+XCache

Location:

trunk

Files:

• . (modified) (1 prop)
• xcache.c (modified) (2 diffs)

trunk/xcache.c

@@ -1661 +1661 @@
         xc_cest_t tmp_cest;
 
+        zend_hash_destroy(&XG(internal_function_table));
+        zend_hash_destroy(&XG(internal_class_table));
+
         zend_hash_init_ex(&XG(internal_function_table), 100, NULL, CG(function_table)->pDestructor, 1, 0);
+        zend_hash_init_ex(&XG(internal_class_table),    10,  NULL, CG(class_table)->pDestructor,    1, 0);
+
         zend_hash_copy(&XG(internal_function_table), CG(function_table), (copy_ctor_func_t) function_add_ref, &tmp_func, sizeof(tmp_func));
-
-        zend_hash_init_ex(&XG(internal_class_table), 10, NULL, CG(class_table)->pDestructor, 1, 0);
         zend_hash_copy(&XG(internal_class_table), CG(class_table), (copy_ctor_func_t) xc_zend_class_add_ref, &tmp_cest, sizeof(tmp_cest));
     }
@@ -1712 +1715 @@
 {
     memset(xcache_globals, 0, sizeof(zend_xcache_globals));
+
+    zend_hash_init_ex(&xcache_globals->internal_function_table, 1, NULL, NULL, 1, 0);
+    zend_hash_init_ex(&xcache_globals->internal_class_table,    1, NULL, NULL, 1, 0);
+
 }
 /* }}} */