Changeset 246 in svn for tags/1.1/utils.c
- Timestamp:
- 2006-10-11T09:03:55Z (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tags/1.1/utils.c
r148 r246 272 272 NULL 273 273 ) == FAILURE) { 274 CG(in_compilation) = 1;275 CG(compiled_filename) = filename;276 274 CG(zend_lineno) = 0; 277 275 #ifdef IS_UNICODE … … 308 306 NULL 309 307 ) == FAILURE) { 310 CG(in_compilation) = 1;311 CG(compiled_filename) = filename;312 308 CG(zend_lineno) = ZESW(func->op_array.opcodes[0].lineno, func->op_array.line_start); 313 309 #ifdef IS_UNICODE … … 341 337 ZESW(&stored_ce_ptr, NULL) 342 338 ) == FAILURE) { 343 CG(in_compilation) = 1;344 CG(compiled_filename) = filename;345 339 CG(zend_lineno) = ZESW(0, cep->line_start); 346 340 #ifdef IS_UNICODE … … 396 390 397 391 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 398 397 399 398 return sandbox; … … 428 427 /* install class */ 429 428 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, 431 430 BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY(b)), b->nKeyLength TSRMLS_CC); 432 431 b = b->pListNext; … … 448 447 449 448 if (install) { 449 CG(in_compilation) = 1; 450 CG(compiled_filename) = sandbox->filename; 451 CG(zend_lineno) = 0; 450 452 xc_sandbox_install(sandbox TSRMLS_CC); 453 CG(in_compilation) = 0; 454 CG(compiled_filename) = NULL; 451 455 452 456 /* no free as it's installed */ … … 469 473 memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files))); 470 474 475 #ifdef E_STRICT 476 EG(user_error_handler_error_reporting) = sandbox->orig_user_error_handler_error_reporting; 477 #endif 478 471 479 if (sandbox->alloc) { 472 480 efree(sandbox);
Note: See TracChangeset
for help on using the changeset viewer.