svn: /php/php-src/ branches/PHP_5_4/Zend/zend_exceptions.c trunk/Zend/zend_exceptions.c
| From: | Pierre Joye | Date: | Sun, 21 Aug 2011 11:51:00 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/Zend/zend_exceptions.c trunk/Zend/zend_exceptions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65919@lists.php.net to get a copy of this message | ||
pajoye Sun, 21 Aug 2011 11:51:00 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315254
Log:
- Fix bug #55471, fix zts build with dtrace (Laruense)
Bug: https://bugs.php.net/55471 (Verified)
zend_get_object_classname
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c
U php/php-src/trunk/Zend/zend_exceptions.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c 2011-08-21 09:38:55 UTC (rev 315253)
+++ php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c 2011-08-21 11:51:00 UTC (rev 315254)
@@ -89,7 +89,7 @@
int name_len;
if (exception != NULL) {
- zend_get_object_classname(exception, &classname, &name_len);
+ zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC);
DTRACE_EXCEPTION_THROWN(classname);
} else {
DTRACE_EXCEPTION_THROWN(NULL);
Modified: php/php-src/trunk/Zend/zend_exceptions.c
===================================================================
--- php/php-src/trunk/Zend/zend_exceptions.c 2011-08-21 09:38:55 UTC (rev 315253)
+++ php/php-src/trunk/Zend/zend_exceptions.c 2011-08-21 11:51:00 UTC (rev 315254)
@@ -89,7 +89,8 @@
int name_len;
if (exception != NULL) {
- zend_get_object_classname(exception, &classname, &name_len);
+ zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC);
+
DTRACE_EXCEPTION_THROWN(classname);
} else {
DTRACE_EXCEPTION_THROWN(NULL);