Changeset 641 for branches/1.3/xcache.c

Timestamp:

2009-07-05T16:56:27+02:00 (4 years ago)

Author:

moo

Message:

merged r637,r634,r640 from trunk

Location:

branches/1.3

Files:

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

branches/1.3/xcache.c

@@ -1585 +1585 @@
 }
 /* }}} */
-static void xc_copy_zend_constant(zend_constant *c) /* {{{ */
-{
-    c->name = zend_strndup(c->name, c->name_len - 1);
-    if (!(c->flags & CONST_PERSISTENT)) {
-        zval_copy_ctor(&c->value);
-    }
-}
-/* }}} */
 static void xc_request_init(TSRMLS_D) /* {{{ */
 {
@@ -1598 +1590 @@
 
     if (!XG(internal_table_copied)) {
-#ifdef HAVE_XCACHE_CONSTANT
-        zend_constant tmp_const;
-#endif
         zend_function tmp_func;
         xc_cest_t tmp_cest;
@@ -1611 +1600 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-        zend_hash_init_ex(&XG(internal_constant_table), 20,  NULL, NULL, 1, 0);
+        zend_hash_init_ex(&XG(internal_constant_table), 20,  NULL, (dtor_func_t) xc_zend_constant_dtor, 1, 0);
 #endif
         zend_hash_init_ex(&XG(internal_function_table), 100, NULL, NULL, 1, 0);
@@ -1617 +1606 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-        zend_hash_copy(&XG(internal_constant_table), EG(zend_constants), (copy_ctor_func_t) xc_copy_zend_constant, &tmp_const, sizeof(tmp_const));
+        xc_copy_internal_zend_constants(&XG(internal_constant_table), EG(zend_constants));
 #endif
         zend_hash_copy(&XG(internal_function_table), CG(function_table), NULL, &tmp_func, sizeof(tmp_func));
@@ -1678 +1667 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-    zend_hash_init_ex(&xcache_globals->internal_constant_table, 1, NULL, NULL, 1, 0);
+    zend_hash_init_ex(&xcache_globals->internal_constant_table, 1, NULL, (dtor_func_t) xc_zend_constant_dtor, 1, 0);
 #endif
     zend_hash_init_ex(&xcache_globals->internal_function_table, 1, NULL, NULL, 1, 0);
@@ -1958 +1947 @@
         default:
 #ifdef IS_UNICODE
-            convert_to_text(name);
+            convert_to_unicode(name);
 #else
             convert_to_string(name);