Changeset 939


Ignore:
Timestamp:
2012-06-29T06:07:05+02:00 (2 years ago)
Author:
moo
Message:

no need to add to open_files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/xcache.c

    r938 r939  
    745745/* }}} */ 
    746746 
    747 static zend_op_array *xc_entry_install(xc_entry_php_t *entry_php, zend_file_handle *h TSRMLS_DC) /* {{{ */ 
     747static zend_op_array *xc_entry_install(xc_entry_php_t *entry_php TSRMLS_DC) /* {{{ */ 
    748748{ 
    749749    zend_uint i; 
     
    815815    i = 1; 
    816816    zend_hash_add(&EG(included_files), entry_php->entry.name.str.val, entry_php->entry.name.str.len+1, (void *)&i, sizeof(int), NULL); 
    817     if (h) { 
    818         zend_llist_add_element(&CG(open_files), h); 
    819     } 
    820817 
    821818#ifndef ZEND_ENGINE_2 
     
    18421839} 
    18431840/* }}} */ 
    1844 static zend_op_array *xc_compile_restore(xc_entry_php_t *stored_entry, xc_entry_data_php_t *stored_php, zend_file_handle *h TSRMLS_DC) /* {{{ */ 
     1841static zend_op_array *xc_compile_restore(xc_entry_php_t *stored_entry, xc_entry_data_php_t *stored_php TSRMLS_DC) /* {{{ */ 
    18451842{ 
    18461843    zend_op_array *op_array; 
     
    18621859    catched = 0; 
    18631860    zend_try { 
    1864         op_array = xc_entry_install(&restored_entry, h TSRMLS_CC); 
     1861        op_array = xc_entry_install(&restored_entry TSRMLS_CC); 
    18651862    } zend_catch { 
    18661863        catched = 1; 
     
    21202117    /* found entry */ 
    21212118    if (stored_entry && stored_php) { 
    2122         return xc_compile_restore(stored_entry, stored_php, h TSRMLS_CC); 
     2119        return xc_compile_restore(stored_entry, stored_php TSRMLS_CC); 
    21232120    } 
    21242121 
     
    21362133    op_array = xc_sandbox(xc_compile_file_sandboxed, (void *) &sandboxed_compiler, h->opened_path ? h->opened_path : h->filename TSRMLS_CC); 
    21372134    if (sandboxed_compiler.stored_entry) { 
    2138         return xc_compile_restore(stored_entry, stored_php, h TSRMLS_CC); 
     2135        return xc_compile_restore(sandboxed_compiler.stored_entry, sandboxed_compiler.stored_php TSRMLS_CC); 
    21392136    } 
    21402137    else { 
Note: See TracChangeset for help on using the changeset viewer.