Changeset 1163 for trunk


Ignore:
Timestamp:
2012-11-06T03:41:16+01:00 (21 months ago)
Author:
moo
Message:

compatible with "the ionCube PHP Loader"

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r1161 r1163  
    33======== 
    44 * fixed #290: workaround phpize vs fbsd make bug again 
     5 * compatible with "the ionCube PHP Loader" 
    56 
    673.0.0 2012-10-29 
  • trunk/NEWS

    r1161 r1163  
    33======== 
    44 * bug fixes 
     5 * compatible with "the ionCube PHP Loader" 
    56 
    673.0.0 2012-10-29 
  • trunk/xcache.c

    r1134 r1163  
    561561} xc_incompatible_zend_extension_info_t; 
    562562static xc_incompatible_zend_extension_info_t xc_incompatible_zend_extensions[] = { 
    563     { "Zend Optimizer", NULL } 
     563    { "Zend Optimizer", NULL }, 
     564    { "the ionCube PHP Loader", NULL } 
    564565}; 
    565566 
     
    584585    zend_bool catched = 0; 
    585586    zend_llist old_zend_extensions = zend_extensions; 
    586     TSRMLS_FETCH(); 
    587  
    588     /* hide all extensions from it */ 
    589     zend_extensions.head = NULL; 
    590     zend_extensions.count = 0; 
    591587 
    592588    /* restore */ 
     
    595591    assert(extension->startup); 
    596592 
     593    /* hide all extensions from it */ 
     594    zend_extensions.head = NULL; 
     595    zend_extensions.tail = NULL; 
     596    zend_extensions.count = 0; 
     597    zend_extensions.dtor = NULL; 
     598    zend_llist_add_element(&zend_extensions, extension); 
     599    extension = zend_get_extension(extension->name); 
     600 
     601    assert(extension->startup != xc_incompatible_zend_extension_startup_hook); 
    597602    zend_try { 
    598603        status = extension->startup(extension); 
     
    601606    } zend_end_try(); 
    602607 
     608    /* restore */ 
    603609    zend_extensions = old_zend_extensions; 
    604610    if (catched) { 
Note: See TracChangeset for help on using the changeset viewer.