Changeset ade8255 in git


Ignore:
Timestamp:
2006-10-02T01:09:56Z (13 years ago)
Author:
Xuefer <xuefer@…>
Branches:
1.2, 1.3, 3.0, 3.1, 3.2, master, trunk
Children:
b47072a
Parents:
6bace26
Message:

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

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@209 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • utils.c

    rf46eb95 rade8255  
    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);
  • utils.h

    r76174b4 rade8255  
    3535typedef struct {
    3636    int alloc;
     37    int orig_user_error_handler_error_reporting;
    3738    char *filename;
    3839
Note: See TracChangeset for help on using the changeset viewer.