Changeset 235 for trunk


Ignore:
Timestamp:
2006-10-11T02:26:23+02:00 (8 years ago)
Author:
moo
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/utils.c

    r226 r235  
    425425                NULL 
    426426                ) == FAILURE) { 
    427         CG(in_compilation) = 1; 
    428         CG(compiled_filename) = filename; 
    429427        CG(zend_lineno) = 0; 
    430428#ifdef IS_UNICODE 
     
    461459                    NULL 
    462460                    ) == FAILURE) { 
    463             CG(in_compilation) = 1; 
    464             CG(compiled_filename) = filename; 
    465461            CG(zend_lineno) = ZESW(func->op_array.opcodes[0].lineno, func->op_array.line_start); 
    466462#ifdef IS_UNICODE 
     
    497493                ZESW(&stored_ce_ptr, NULL) 
    498494                ) == FAILURE) { 
    499         CG(in_compilation) = 1; 
    500         CG(compiled_filename) = filename; 
    501495        CG(zend_lineno) = ZESW(0, cep->line_start); 
    502496#ifdef IS_UNICODE 
     
    619613 
    620614    if (install) { 
     615        CG(in_compilation)    = 1; 
     616        CG(compiled_filename) = sandbox->filename; 
     617        CG(zend_lineno)       = 0; 
    621618        xc_sandbox_install(sandbox TSRMLS_CC); 
     619        CG(in_compilation)    = 0; 
     620        CG(compiled_filename) = NULL; 
    622621 
    623622        /* no free as it's installed */ 
  • trunk/xcache.c

    r233 r235  
    10751075 
    10761076restore: 
     1077    CG(in_compilation)    = 1; 
     1078    CG(compiled_filename) = stored_xce->name.str.val; 
     1079    CG(zend_lineno)       = 0; 
    10771080#ifdef DEBUG 
    10781081    fprintf(stderr, "restoring\n"); 
     
    11051108        zend_bailout(); 
    11061109    } 
     1110    CG(in_compilation)    = 0; 
     1111    CG(compiled_filename) = NULL; 
    11071112#ifdef DEBUG 
    11081113    fprintf(stderr, "restored\n"); 
Note: See TracChangeset for help on using the changeset viewer.