Changeset 235 for trunk/utils.c

Timestamp:

2006-10-11T02:26:23+02:00 (7 years ago)

Author:

moo

Message:

cacher: trick in_compilation state, don't trigger __autoload at compile time

File:

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

trunk/utils.c

@@ -425 +425 @@
                 NULL
                 ) == FAILURE) {
-        CG(in_compilation) = 1;
-        CG(compiled_filename) = filename;
         CG(zend_lineno) = 0;
 #ifdef IS_UNICODE
@@ -461 +459 @@
                     NULL
                     ) == FAILURE) {
-            CG(in_compilation) = 1;
-            CG(compiled_filename) = filename;
             CG(zend_lineno) = ZESW(func->op_array.opcodes[0].lineno, func->op_array.line_start);
 #ifdef IS_UNICODE
@@ -497 +493 @@
                 ZESW(&stored_ce_ptr, NULL)
                 ) == FAILURE) {
-        CG(in_compilation) = 1;
-        CG(compiled_filename) = filename;
         CG(zend_lineno) = ZESW(0, cep->line_start);
 #ifdef IS_UNICODE
@@ -619 +613 @@
 
     if (install) {
+        CG(in_compilation)    = 1;
+        CG(compiled_filename) = sandbox->filename;
+        CG(zend_lineno)       = 0;
         xc_sandbox_install(sandbox TSRMLS_CC);
+        CG(in_compilation)    = 0;
+        CG(compiled_filename) = NULL;
 
         /* no free as it's installed */