ZTS fixes.

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 852821c8173c6d75b374ee47993792b250e97cb3..49e2424a4ad95adbfa93e2764a80dbd73112fb77 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1259,7 +1259,7 @@ ZEND_API int add_index_stringl(zval *arg, uint index, char *str, uint length, in
 }
 
 
-ZEND_API int add_index_binary(zval *arg, uint index, char *str, int duplicate)
+ZEND_API int add_index_binary(zval *arg, uint index, char *str, int duplicate TSRMLS_DC)
 {
        zval *tmp;
        
@@ -1270,7 +1270,7 @@ ZEND_API int add_index_binary(zval *arg, uint index, char *str, int duplicate)
 }
 
 
-ZEND_API int add_index_binaryl(zval *arg, uint index, char *str, uint length, int duplicate)
+ZEND_API int add_index_binaryl(zval *arg, uint index, char *str, uint length, int duplicate TSRMLS_DC)
 {
        zval *tmp;
        

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 38b4a9f19998a535557eb39456996c7bc9c5ee70..71473c150b2117e9df5bb864275c827a7db361d6 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -297,8 +297,8 @@ ZEND_API int add_index_resource(zval *arg, uint idx, int r);
 ZEND_API int add_index_double(zval *arg, uint idx, double d);
 ZEND_API int add_index_string(zval *arg, uint idx, char *str, int duplicate);
 ZEND_API int add_index_stringl(zval *arg, uint idx, char *str, uint length, int duplicate);
-ZEND_API int add_index_binary(zval *arg, uint idx, char *str, int duplicate);
-ZEND_API int add_index_binaryl(zval *arg, uint idx, char *str, uint length, int duplicate);
+ZEND_API int add_index_binary(zval *arg, uint idx, char *str, int duplicate TSRMLS_DC);
+ZEND_API int add_index_binaryl(zval *arg, uint idx, char *str, uint length, int duplicate TSRMLS_DC);
 ZEND_API int add_index_unicode(zval *arg, uint idx, UChar *str, int duplicate);
 ZEND_API int add_index_unicodel(zval *arg, uint idx, UChar *str, uint length, int duplicate);
 ZEND_API int add_index_zval(zval *arg, uint index, zval *value);

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 86c68cad137d5bae77d1ab5f2b8e410d0c0f9569..6bd87e569593be7b0885b41e2837c9e8d47fac14 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2208,7 +2208,7 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent
 
        zend_hash_merge(&ce->constants_table, &parent_ce->constants_table, (void (*)(void *)) zval_add_ref, NULL, sizeof(zval *), 0);
        zend_hash_merge_ex(&ce->function_table, &parent_ce->function_table, (copy_ctor_func_t) do_inherit_method, sizeof(zend_function), (merge_checker_func_t) do_inherit_method_check, ce);
-       do_inherit_parent_constructor(ce);
+       do_inherit_parent_constructor(ce TSRMLS_CC);
 
        if (ce->ce_flags & ZEND_ACC_IMPLICIT_ABSTRACT_CLASS && ce->type == ZEND_INTERNAL_CLASS) {
                ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;

diff --git a/ext/standard/string.c b/ext/standard/string.c
index cc15d8898bcac791c78346b878f282b55988cb50..bb20910e28560df6bee1593366995bebb9344129 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -584,7 +584,7 @@ PHPAPI char *php_trim(char *c, int len, char *what, int what_len, zval *return_v
  * Expands possible ranges of the form 'a..b' in input charlist,
  * where a < b in code-point order
  */
-static int php_expand_u_trim_range(UChar **range, int32_t *range_len)
+static int php_expand_u_trim_range(UChar **range, int32_t *range_len TSRMLS_DC)
 {
        UChar32 *codepts, *tmp, *input, *end, c;
        int32_t len, tmp_len, idx;
@@ -673,7 +673,7 @@ static UChar *php_u_trim(UChar *c, int32_t len, UChar *what, int32_t what_len, z
        int32_t start = 0, end = len;
 
        if ( what ) {
-               php_expand_u_trim_range(&what, &what_len);
+               php_expand_u_trim_range(&what, &what_len TSRMLS_CC);
        }
 
        if ( mode & 1 ) {
@@ -1110,7 +1110,7 @@ PHP_FUNCTION(explode)
                if ( str_type == IS_UNICODE ) {
                        add_index_unicodel(return_value, 0, (UChar *)str, str_len, 1);
                } else if ( str_type == IS_BINARY ) {
-                       add_index_binaryl(return_value, 0, (char *)str, str_len, 1);
+                       add_index_binaryl(return_value, 0, (char *)str, str_len, 1 TSRMLS_CC);
                } else {
                        add_index_stringl(return_value, 0, (char *)str, str_len, 1);
                }