Changeset 954 for trunk/utils.c


Ignore:
Timestamp:
2012-07-06T11:18:49+02:00 (2 years ago)
Author:
moo
Message:

restore open_files handling, it is required. disable included_files which is real EG since PHP 5_2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/utils.c

    r938 r954  
    585585    ZEND_24(NOTHING, const) char *filename; 
    586586 
     587#ifndef ZEND_ENGINE_2_2 
    587588    HashTable orig_included_files; 
    588589    HashTable *tmp_included_files; 
     590#endif 
    589591 
    590592#ifdef HAVE_XCACHE_CONSTANT 
     
    772774    memset(sandbox, 0, sizeof(sandbox[0])); 
    773775 
     776#ifndef ZEND_ENGINE_2_2 
    774777    memcpy(&OG(included_files), &EG(included_files), sizeof(EG(included_files))); 
     778#endif 
    775779 
    776780#ifdef HAVE_XCACHE_CONSTANT 
     
    791795#endif 
    792796 
     797#ifndef ZEND_ENGINE_2_2 
    793798    TG(included_files) = &EG(included_files); 
    794  
     799#endif 
     800 
     801#ifndef ZEND_ENGINE_2_2 
    795802    zend_hash_init_ex(TG(included_files), 5, NULL, NULL, 0, 1); 
     803#endif 
    796804#ifdef HAVE_XCACHE_CONSTANT 
    797805    h = OG(zend_constants); 
     
    926934#endif 
    927935 
     936#ifndef ZEND_ENGINE_2_2 
    928937    i = 1; 
    929938    zend_hash_add(&OG(included_files), sandbox->filename, strlen(sandbox->filename) + 1, (void *)&i, sizeof(int), NULL); 
     939#endif 
    930940} 
    931941/* }}} */ 
     
    978988    zend_hash_destroy(&TG(auto_globals)); 
    979989#endif 
     990#ifndef ZEND_ENGINE_2_2 
    980991    zend_hash_destroy(TG(included_files)); 
    981  
     992#endif 
     993 
     994#ifndef ZEND_ENGINE_2_2 
    982995    /* restore orig here, as EG/CG holded tmp before */ 
    983996    memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files))); 
     997#endif 
    984998 
    985999#ifdef XCACHE_ERROR_CACHING 
Note: See TracChangeset for help on using the changeset viewer.