Changeset 701 in svn


Ignore:
Timestamp:
2011-02-08T05:23:09Z (5 years ago)
Author:
Xuefer
Message:

merge from trunk: fix segv on shutdown when ionCube Loader is loaded

Location:
branches/1.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 698
  • branches/1.3/ChangeLog

    r699 r701  
    22========
    33 * fix win32 build against win32 native gnu tools
     4 * compatibility fix: fix segv on shutdown when ionCube Loader is loaded
    45
    561.3.1 2010-11-27
  • branches/1.3/NEWS

    r699 r701  
    22========
    33 * win32 build fix
     4 * improve compatibility with ionCube Loader
    45
    561.3.1 2010-11-27
  • branches/1.3/xcache.c

    r680 r701  
    29662966    if (xc_zend_extension_faked) {
    29672967        zend_extension *ext = zend_get_extension(XCACHE_NAME);
    2968         if (ext->shutdown) {
    2969             ext->shutdown(ext);
    2970         }
    2971         xc_zend_remove_extension(ext);
     2968        if (ext) {
     2969            if (ext->shutdown) {
     2970                ext->shutdown(ext);
     2971            }
     2972            xc_zend_remove_extension(ext);
     2973        }
    29722974    }
    29732975    UNREGISTER_INI_ENTRIES();
Note: See TracChangeset for help on using the changeset viewer.