cvs: ZendEngine2(PHP_5_2) / zend.c

tony2001                Thu Dec 28 21:02:15 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /ZendEngine2        zend.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.26&r2=1.308.2.12.2.27&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.26 ZendEngine2/zend.c:1.308.2.12.2.27
--- ZendEngine2/zend.c:1.308.2.12.2.26  Tue Dec 26 16:44:20 2006
+++ ZendEngine2/zend.c  Thu Dec 28 21:02:14 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend.c,v 1.308.2.12.2.26 2006/12/26 16:44:20 iliaa Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.27 2006/12/28 21:02:14 tony2001 Exp $ */
 
 #include "zend.h"
 #include "zend_extensions.h"
@@ -429,8 +429,8 @@
 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 @@
                        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;

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php