Changeset 627 for branches/1.3/utils.c

Timestamp:

07/05/2009 11:24:38 AM (4 years ago)

Author:

moo

Message:

merged r585:592 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• utils.c (modified) (4 diffs)

branches/1.3/utils.c

@@ -598 +598 @@
 #endif
 
+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);
+    }
+}
+/* }}} */
 xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC) /* {{{ */
 {
@@ -635 +643 @@
     h = OG(zend_constants);
     zend_hash_init_ex(&TG(zend_constants),  20, NULL, h->pDestructor, h->persistent, h->bApplyProtection);
+    {
+        zend_constant tmp_const;
+        zend_hash_copy(&TG(zend_constants), &XG(internal_constant_table), (copy_ctor_func_t) xc_copy_zend_constant, (void *) &tmp_const, sizeof(tmp_const));
+    }
 #endif
     h = OG(function_table);
@@ -677 +689 @@
     /* Using ZEND_COMPILE_IGNORE_INTERNAL_CLASSES for ZEND_FETCH_CLASS_RT_NS_CHECK
      */
-    CG(compiler_options) |= ZEND_COMPILE_IGNORE_INTERNAL_CLASSES | ZEND_COMPILE_DELAYED_BINDING;
+    CG(compiler_options) |= ZEND_COMPILE_IGNORE_INTERNAL_CLASSES | ZEND_COMPILE_NO_CONSTANT_SUBSTITUTION | ZEND_COMPILE_DELAYED_BINDING;
 #endif
 
@@ -696 +708 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-    b = TG(zend_constants).pListHead;
+    b = /*TG(internal_constant_tail) ? TG(internal_constant_tail)->pListNext :*/ TG(zend_constants).pListHead;
     /* install constants */
     while (b != NULL) {