Changeset 246 in svn


Ignore:
Timestamp:
2006-10-11T09:03:55Z (9 years ago)
Author:
Xuefer
Message:

merged [211] [227] [235]

Location:
tags/1.1
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • tags/1.1/utils.c

    r148 r246  
    272272                NULL
    273273                ) == FAILURE) {
    274         CG(in_compilation) = 1;
    275         CG(compiled_filename) = filename;
    276274        CG(zend_lineno) = 0;
    277275#ifdef IS_UNICODE
     
    308306                    NULL
    309307                    ) == FAILURE) {
    310             CG(in_compilation) = 1;
    311             CG(compiled_filename) = filename;
    312308            CG(zend_lineno) = ZESW(func->op_array.opcodes[0].lineno, func->op_array.line_start);
    313309#ifdef IS_UNICODE
     
    341337                ZESW(&stored_ce_ptr, NULL)
    342338                ) == FAILURE) {
    343         CG(in_compilation) = 1;
    344         CG(compiled_filename) = filename;
    345339        CG(zend_lineno) = ZESW(0, cep->line_start);
    346340#ifdef IS_UNICODE
     
    396390
    397391    sandbox->filename = filename;
     392
     393#ifdef E_STRICT
     394    sandbox->orig_user_error_handler_error_reporting = EG(user_error_handler_error_reporting);
     395    EG(user_error_handler_error_reporting) &= ~E_STRICT;
     396#endif
    398397
    399398    return sandbox;
     
    428427    /* install class */
    429428    while (b != NULL) {
    430         xc_install_class(sandbox->filename, (xc_cest_t*)b->pData,
     429        xc_install_class(sandbox->filename, (xc_cest_t*) b->pData,
    431430                BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY(b)), b->nKeyLength TSRMLS_CC);
    432431        b = b->pListNext;
     
    448447
    449448    if (install) {
     449        CG(in_compilation)    = 1;
     450        CG(compiled_filename) = sandbox->filename;
     451        CG(zend_lineno)       = 0;
    450452        xc_sandbox_install(sandbox TSRMLS_CC);
     453        CG(in_compilation)    = 0;
     454        CG(compiled_filename) = NULL;
    451455
    452456        /* no free as it's installed */
     
    469473    memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files)));
    470474
     475#ifdef E_STRICT
     476    EG(user_error_handler_error_reporting) = sandbox->orig_user_error_handler_error_reporting;
     477#endif
     478
    471479    if (sandbox->alloc) {
    472480        efree(sandbox);
  • tags/1.1/utils.h

    r131 r246  
    3535typedef struct {
    3636    int alloc;
     37    int orig_user_error_handler_error_reporting;
    3738    char *filename;
    3839
  • tags/1.1/xcache.c

    r154 r246  
    985985
    986986restore:
    987     if (php_check_open_basedir(stored_xce->name.str.val TSRMLS_CC) != 0) {
    988         return NULL;
    989     }
    990 
     987    CG(in_compilation)    = 1;
     988    CG(compiled_filename) = stored_xce->name.str.val;
     989    CG(zend_lineno)       = 0;
    991990#ifdef DEBUG
    992991    fprintf(stderr, "restoring\n");
     
    10161015        zend_bailout();
    10171016    }
     1017    CG(in_compilation)    = 0;
     1018    CG(compiled_filename) = NULL;
    10181019#ifdef DEBUG
    10191020    fprintf(stderr, "restored\n");
Note: See TracChangeset for help on using the changeset viewer.