Changeset 209 for trunk/utils.c


Ignore:
Timestamp:
2006-10-02T03:09:56+02:00 (8 years ago)
Author:
moo
Message:

fixed #42, conflict between xcache sandbox and user error handler

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/utils.c

    r203 r209  
    397397    sandbox->filename = filename; 
    398398 
     399#ifdef E_STRICT 
     400    sandbox->orig_user_error_handler_error_reporting = EG(user_error_handler_error_reporting); 
     401    EG(user_error_handler_error_reporting) &= ~E_STRICT; 
     402#endif 
     403 
    399404    return sandbox; 
    400405} 
     
    428433    /* install class */ 
    429434    while (b != NULL) { 
    430         xc_install_class(sandbox->filename, (xc_cest_t*)b->pData, 
     435        xc_install_class(sandbox->filename, (xc_cest_t*) b->pData, -1, 
    431436                BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength TSRMLS_CC); 
    432437        b = b->pListNext; 
     
    469474    memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files))); 
    470475 
     476#ifdef E_STRICT 
     477    EG(user_error_handler_error_reporting) = sandbox->orig_user_error_handler_error_reporting; 
     478#endif 
     479 
    471480    if (sandbox->alloc) { 
    472481        efree(sandbox); 
Note: See TracChangeset for help on using the changeset viewer.