Fix ZTS

diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c
index 3b943fd33649069dba8156b7f1d47dbb49d567c8..c7fc6b4f2f3d38571fbf257dd45dacb1518febbd 100644 (file)
--- a/ext/json/JSON_parser.c
+++ b/ext/json/JSON_parser.c
@@ -291,7 +291,7 @@ static int dehexchar(char c)
 }
 
 
-static void json_create_zval(zval *z, smart_str *buf, int type, int options)
+static void json_create_zval(zval *z, smart_str *buf, int type, int options TSRMLS_DC)
 {
     if (type == IS_LONG)
     {
@@ -557,7 +557,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
                     zval mval;
                     smart_str_0(&buf);
 
-                    json_create_zval(&mval, &buf, type, options);
+                    json_create_zval(&mval, &buf, type, options TSRMLS_CC);
 
                                        add_assoc_or_property(assoc, &jp->the_zstack[jp->top], &key, &mval TSRMLS_CC);
 
@@ -580,7 +580,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
                     zval mval;
                     smart_str_0(&buf);
 
-                    json_create_zval(&mval, &buf, type, options);
+                    json_create_zval(&mval, &buf, type, options TSRMLS_CC);
                     add_next_index_zval(&jp->the_zstack[jp->top], &mval);
                     buf.s->len = 0;
                     JSON_RESET_TYPE();
@@ -689,7 +689,7 @@ parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length,
                      jp->stack[jp->top] == MODE_ARRAY))
                 {
                     smart_str_0(&buf);
-                    json_create_zval(&mval, &buf, type, options);
+                    json_create_zval(&mval, &buf, type, options TSRMLS_CC);
                 }
 
                 switch (jp->stack[jp->top]) {

diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 30ceae6113b8754c37d21aae8f125873e6389319..9f5d9d03ca7637b2445b6dee349210bbbb3e3b4d 100644 (file)
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -1632,7 +1632,7 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /*
 
                        if ((zval_file = zend_hash_index_find(Z_ARRVAL_P(return_value), i)) != NULL) {
                                if (remove_all_path) {
-                                       basename = php_basename(Z_STRVAL_P(zval_file), Z_STRLEN_P(zval_file), NULL, 0);
+                                       basename = php_basename(Z_STRVAL_P(zval_file), Z_STRLEN_P(zval_file), NULL, 0 TSRMLS_CC);
                                        file_stripped = basename->val;
                                        file_stripped_len = basename->len;
                                } else if (remove_path && strstr(Z_STRVAL_P(zval_file), remove_path) != NULL) {