Changeset e757f00 in git


Ignore:
Timestamp:
2006-10-02T01:15:04Z (13 years ago)
Author:
Xuefer <xuefer@…>
Branches:
1.0
Children:
d8097b1
Parents:
052650b
Message:

trunk->b1.0 [209] [210]: conflict between sandbox and user error handler

git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.0@211 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • utils.c

    rd7d6864 re757f00  
    335335    sandbox->filename = filename;
    336336
     337#ifdef E_STRICT
     338    sandbox->orig_user_error_handler_error_reporting = EG(user_error_handler_error_reporting);
     339    EG(user_error_handler_error_reporting) &= ~E_STRICT;
     340#endif
     341
    337342    return sandbox;
    338343}
     
    357362    /* install class */
    358363    while (b != NULL) {
    359         xc_install_class(sandbox->filename, (xc_cest_t*)b->pData,
     364        xc_install_class(sandbox->filename, (xc_cest_t*) b->pData,
    360365                BUCKET_KEY_TYPE(b), BUCKET_KEY(b), b->nKeyLength TSRMLS_CC);
    361366        b = b->pListNext;
     
    397402    memcpy(&CG(open_files),     &OG(open_files),     sizeof(CG(open_files)));
    398403
     404#ifdef E_STRICT
     405    EG(user_error_handler_error_reporting) = sandbox->orig_user_error_handler_error_reporting;
     406#endif
     407
    399408    if (sandbox->alloc) {
    400409        efree(sandbox);
  • utils.h

    r4389208 re757f00  
    3232typedef struct {
    3333    int alloc;
     34    int orig_user_error_handler_error_reporting;
    3435    char *filename;
    3536
Note: See TracChangeset for help on using the changeset viewer.