Changeset 406 for branches/1.2/xcache.c


Ignore:
Timestamp:
2007-05-31T06:00:33+02:00 (8 years ago)
Author:
moo
Message:

merged [402] [403] [404] from trunk: s/origin_compile_file/old_compile_file/g and init global vars

Location:
branches/1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2

  • branches/1.2/xcache.c

    r401 r406  
    9898 
    9999static zend_bool xc_initized = 0; 
    100 static zend_compile_file_t *origin_compile_file; 
    101 static zend_llist_element  *xc_llist_zend_extension; 
     100static zend_compile_file_t *old_compile_file = NULL; 
     101static zend_llist_element  *xc_llist_zend_extension = NULL; 
    102102 
    103103static zend_bool xc_test = 0; 
     
    857857 
    858858    if (!XG(cacher)) { 
    859         op_array = origin_compile_file(h, type TSRMLS_CC); 
     859        op_array = old_compile_file(h, type TSRMLS_CC); 
    860860#ifdef HAVE_XCACHE_OPTIMIZER 
    861861        if (XG(optimizer)) { 
     
    876876    xce.data.php = &php; 
    877877    if (!xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC)) { 
    878         return origin_compile_file(h, type TSRMLS_CC); 
     878        return old_compile_file(h, type TSRMLS_CC); 
    879879    } 
    880880    cache = xce.cache; 
     
    884884    if (cache->compiling) { 
    885885        cache->clogs ++; /* is it safe here? */ 
    886         return origin_compile_file(h, type TSRMLS_CC); 
     886        return old_compile_file(h, type TSRMLS_CC); 
    887887    } 
    888888 
     
    925925    /* clogged */ 
    926926    if (clogged) { 
    927         return origin_compile_file(h, type TSRMLS_CC); 
     927        return old_compile_file(h, type TSRMLS_CC); 
    928928    } 
    929929    /* }}} */ 
     
    942942 
    943943    zend_try { 
    944         op_array = origin_compile_file(h, type TSRMLS_CC); 
     944        op_array = old_compile_file(h, type TSRMLS_CC); 
    945945    } zend_catch { 
    946946        catched = 1; 
     
    13751375    xc_shm_t *shm = NULL; 
    13761376 
    1377     if (origin_compile_file) { 
    1378         zend_compile_file = origin_compile_file; 
    1379         origin_compile_file = NULL; 
     1377    if (old_compile_file) { 
     1378        zend_compile_file = old_compile_file; 
     1379        old_compile_file = NULL; 
    13801380    } 
    13811381 
     
    14191419 
    14201420        if (xc_php_size) { 
    1421             origin_compile_file = zend_compile_file; 
     1421            old_compile_file = zend_compile_file; 
    14221422            zend_compile_file = xc_compile_file; 
    14231423 
     
    27462746#endif 
    27472747/* }}} */ 
    2748 static startup_func_t xc_last_ext_startup; 
     2748static startup_func_t xc_last_ext_startup = NULL; 
    27492749static int xc_zend_startup_last(zend_extension *extension) /* {{{ */ 
    27502750{ 
Note: See TracChangeset for help on using the changeset viewer.