Changeset 1178


Ignore:
Timestamp:
2012-11-13T16:16:02+01:00 (21 months ago)
Author:
moo
Message:

improve compatibility with "the ionCube PHP Loader", Zend Optimizer. dont do early binding for cached opcode

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r1176 r1178  
    33======== 
    44 * fixed #290: workaround phpize vs fbsd make bug again 
    5  * improve compatibility with "the ionCube PHP Loader", but still broken 
     5 * improve compatibility with "the ionCube PHP Loader", Zend Optimizer 
    66 
    773.0.0 2012-10-29 
  • trunk/NEWS

    r1176 r1178  
    33======== 
    44 * bug fixes 
     5 * improve compatibility with "the ionCube PHP Loader", Zend Optimizer 
    56 
    673.0.0 2012-10-29 
  • trunk/mod_cacher/xc_cacher.c

    r1151 r1178  
    19461946    memset(&compiler->new_php.op_array_info, 0, sizeof(compiler->new_php.op_array_info)); 
    19471947 
    1948     XG(initial_compile_file_called) = 0; 
    19491948    zend_try { 
    19501949        compiler->new_php.op_array = NULL; 
  • trunk/xcache/xc_sandbox.c

    r992 r1178  
    230230 
    231231    XG(sandbox) = (void *) sandbox; 
     232    XG(initial_compile_file_called) = 0; 
    232233    return sandbox; 
    233234} 
     
    291292#endif 
    292293 
     294    /* CG(compiler_options) applies only if initial_compile_file_called */ 
     295    if (XG(initial_compile_file_called)) { 
    293296#ifdef ZEND_COMPILE_DELAYED_BINDING 
    294     zend_do_delayed_early_binding(CG(active_op_array) TSRMLS_CC); 
     297        zend_do_delayed_early_binding(CG(active_op_array) TSRMLS_CC); 
    295298#else 
    296     xc_undo_pass_two(CG(active_op_array) TSRMLS_CC); 
    297     xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC); 
    298     xc_redo_pass_two(CG(active_op_array) TSRMLS_CC); 
    299 #endif 
     299        xc_undo_pass_two(CG(active_op_array) TSRMLS_CC); 
     300        xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC); 
     301        xc_redo_pass_two(CG(active_op_array) TSRMLS_CC); 
     302#endif 
     303    } 
    300304 
    301305#ifdef XCACHE_ERROR_CACHING 
  • trunk/xcache_globals.h

    r1146 r1178  
    22 
    33ZEND_BEGIN_MODULE_GLOBALS(xcache) 
    4     zend_bool initial_compile_file_called; /* true is origin_compile_file is called */ 
     4    zend_bool initial_compile_file_called; /* true if origin_compile_file is called */ 
    55    zend_bool cacher;      /* true if enabled */ 
    66    zend_bool stat; 
Note: See TracChangeset for help on using the changeset viewer.