Permalink
Browse files

Merge branch 'PHP-5.4'

* PHP-5.4:
  - 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
  • Loading branch information...
2 parents 4a7d1b4 + 954e7a3 commit 2b7bddd82a7d139f7389abb36ab0189ab5831570 @pierrejoye pierrejoye committed Sep 5, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 Zend/zend_opcode.c
View
1 Zend/zend_opcode.c
@@ -309,6 +309,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);

0 comments on commit 2b7bddd

Please sign in to comment.