Commit:    954e7a3b3ca115b619b1b326ae4ae31a7cf196db
Author:    Pierre Joye <pierre....@gmail.com>         Wed, 5 Sep 2012 13:00:04 
+0200
Parents:   6c0508f8d5d5a62adb37a76bc682c94540199ee3
Branches:  PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=954e7a3b3ca115b619b1b326ae4ae31a7cf196db

Log:
- fix build, there was no tsrm context there, doing a fetch but this is 
horribly slow, this fix needs improvement (or simply add a TSRM context in the 
signature in master

Changed paths:
  M  Zend/zend_opcode.c


Diff:
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 6eab0ae..4c6a784 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -308,6 +308,7 @@ ZEND_API void destroy_zend_class(zend_class_entry **pce)
                        zend_hash_destroy(&ce->properties_info);
                        str_efree(ce->name);
                        if ((ce->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
+                               TSRMLS_FETCH();
                                zend_hash_apply(&ce->function_table, 
(apply_func_t)zend_clear_trait_method_name TSRMLS_CC);
                        }
                        zend_hash_destroy(&ce->function_table);


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

Reply via email to