Changeset 548 for trunk/utils.c

Timestamp:

2008-03-21T15:36:17+01:00 (5 years ago)

Author:

moo

Message:

PHP_5_3 support: uses ZEND_COMPILE_IGNORE_INTERNAL_CLASSES and ZEND_COMPILE_DELAYED_BINDING stuffs for PHP_5_3 support finally

File:

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

trunk/utils.c

@@ -500 +500 @@
                     ZESW(&stored_ce_ptr, NULL)
                     );
+#ifndef ZEND_COMPILE_DELAYED_BINDING
         if (oplineno != -1) {
             xc_do_early_binding(CG(active_op_array), CG(class_table), oplineno TSRMLS_CC);
         }
+#endif
     }
     else if (zend_u_hash_quick_add(CG(class_table), type, key, len, h,
@@ -673 +675 @@
 #endif
 
+#ifdef ZEND_COMPILE_IGNORE_INTERNAL_CLASSES
+    sandbox->orig_compiler_options = CG(compiler_options);
+    /* 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;
+#endif
+
     XG(sandbox) = (void *) sandbox;
     return sandbox;
@@ -728 +737 @@
 
     if (install != XC_InstallNoBinding) {
+#ifdef ZEND_COMPILE_DELAYED_BINDING
+        zend_do_delayed_early_binding(CG(active_op_array) TSRMLS_CC);
+#else
         xc_undo_pass_two(CG(active_op_array) TSRMLS_CC);
         xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC);
         xc_redo_pass_two(CG(active_op_array) TSRMLS_CC);
+#endif
     }
 
@@ -805 +818 @@
     }
 #endif
+
+#ifdef ZEND_COMPILE_IGNORE_INTERNAL_CLASSES
+    CG(compiler_options) = sandbox->orig_compiler_options;
+#endif
+
     if (sandbox->alloc) {
         efree(sandbox);