diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-12-28 21:02:14 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-12-28 21:02:14 +0000 |
| commit | 28421f4f19abd0cc5b2e70a0165c9fb688fe040a (patch) | |
| tree | df6b54a6d4c78b9647fbec189e53127aefac75b0 | |
| parent | e5f95ec3e4dfaab75be9537feae226ef33e021a6 (diff) | |
| download | php-git-28421f4f19abd0cc5b2e70a0165c9fb688fe040a.tar.gz | |
MFH
| -rw-r--r-- | Zend/zend.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 6801cc4db0..f04930aa23 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -429,8 +429,8 @@ static void register_standard_class(TSRMLS_D) static void zend_set_default_compile_time_values(TSRMLS_D) { /* default compile-time values */ - CG(asp_tags) = 0; - CG(short_tags) = 1; +/* CG(asp_tags) = 0; + CG(short_tags) = 1; */ CG(allow_call_time_pass_reference) = 1; CG(extended_info) = 0; } @@ -1099,15 +1099,6 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co EG(return_value_ptr_ptr) = retval ? retval : &local_retval; zend_execute(EG(active_op_array) TSRMLS_CC); if (EG(exception)) { - char ex_class_name[128]; - - EG(opline_ptr) = NULL; - if (Z_TYPE_P(EG(exception)) == IS_OBJECT) { - strncpy(ex_class_name, Z_OBJ_CLASS_NAME_P(EG(exception)), 127); - ex_class_name[127] = '\0'; - } else { - strcpy(ex_class_name, "Unknown Exception"); - } if (EG(user_exception_handler)) { zval *orig_user_exception_handler; zval ***params, *retval2, *old_exception; |