svn: /php/php-src/trunk/Zend/ zend_exceptions.c
| From: | Antony Dovgal | Date: | Sun, 25 Apr 2010 19:17:16 +0000 |
| Subject: | svn: /php/php-src/trunk/Zend/ zend_exceptions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62406@lists.php.net to get a copy of this message | ||
tony2001 Sun, 25 Apr 2010 19:17:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=298550
Log:
fix ~450 tests and 25 segfaults
make test, anyone?
Changed paths:
U php/php-src/trunk/Zend/zend_exceptions.c
Modified: php/php-src/trunk/Zend/zend_exceptions.c
===================================================================
--- php/php-src/trunk/Zend/zend_exceptions.c 2010-04-25 18:55:06 UTC (rev 298549)
+++ php/php-src/trunk/Zend/zend_exceptions.c 2010-04-25 19:17:16 UTC (rev 298550)
@@ -90,6 +90,7 @@
zend_get_object_classname(exception, &classname, &name_len);
DTRACE_EXCEPTION_THROWN(classname);
}
+#endif /* HAVE_DTRACE */
if (exception != NULL) {
zval *previous = EG(exception);
@@ -102,7 +103,6 @@
if (!EG(current_execute_data)) {
zend_error(E_ERROR, "Exception thrown without a stack frame");
}
-#endif /* HAVE_DTRACE */
if (zend_throw_exception_hook) {
zend_throw_exception_hook(exception TSRMLS_CC);