Changeset 681

Timestamp:

09/08/2009 05:17:51 AM (4 years ago)

Author:

moo

Message:

PHP_6: new zend_constants.dtor which is used to free zend_constant.value on shutdown. cannot be used for XCache temp zend_constants table

Files:

• trunk/utils.c (modified) (2 diffs)

trunk/utils.c

@@ -641 +641 @@
 {
     assert((c->flags & CONST_PERSISTENT));
-#ifdef IS_UNICODE
-    c->name.u = zend_ustrndup(c->name.u, c->name_len - 1);
-#else
-    c->name = zend_strndup(c->name, c->name_len - 1);
-#endif
+    ZSTR_U(c->name) = UNISW(zend_strndup, zend_ustrndup)(ZSTR_U(c->name), c->name_len - 1);
 }
 /* }}} */
 void xc_zend_constant_dtor(zend_constant *c) /* {{{ */
 {
-    free(ZSTR_U(c->name));
+    free(ZSTR_V(c->name));
+}
+/* }}} */
+void xc_free_zend_constant(zend_constant *c) /* {{{ */
+{
+    if (!(c->flags & CONST_PERSISTENT)) {
+        zval_dtor(&c->value);
+    }
+    free(ZSTR_V(c->name));
 }
 /* }}} */
@@ -696 +700 @@
 #ifdef HAVE_XCACHE_CONSTANT
     h = OG(zend_constants);
-    zend_hash_init_ex(&TG(zend_constants),  20, NULL, h->pDestructor, h->persistent, h->bApplyProtection);
+    zend_hash_init_ex(&TG(zend_constants),  20, NULL, (dtor_func_t) xc_free_zend_constant, h->persistent, h->bApplyProtection);
     xc_copy_internal_zend_constants(&TG(zend_constants), &XG(internal_constant_table));
     {