Fix ZTS build.

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 4a9e0cfc469883f3bfcd48e786ec7e177ca7fa4b..663f276f94851a3f00381127bf8bd6663588088f 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -595,12 +595,12 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC)
 
 /* {{{ php_unescape_html_entities
  */
-PHPAPI char *php_unescape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset)
+PHPAPI char *php_unescape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset TSRMLS_DC)
 {
        int retlen;
        int j, k;
        char *replaced, *ret;
-       enum entity_charset charset = determine_charset(hint_charset);
+       enum entity_charset charset = determine_charset(hint_charset TSRMLS_CC);
        unsigned char replacement[15];
        
        ret = estrdup(old);
@@ -663,11 +663,11 @@ PHPAPI char *php_unescape_html_entities(unsigned char *old, int oldlen, int *new
 
 /* {{{ php_escape_html_entities
  */
-PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset)
+PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset TSRMLS_DC)
 {
        int i, j, maxlen, len;
        char *replaced;
-       enum entity_charset charset = determine_charset(hint_charset);
+       enum entity_charset charset = determine_charset(hint_charset TSRMLS_CC);
        int matches_map;
 
        maxlen = 2 * oldlen;
@@ -766,7 +766,7 @@ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
                return;
        }
 
-       replaced = php_escape_html_entities(str, str_len, &len, all, quote_style, hint_charset);
+       replaced = php_escape_html_entities(str, str_len, &len, all, quote_style, hint_charset TSRMLS_CC);
        RETVAL_STRINGL(replaced, len, 0);
 }
 /* }}} */
@@ -807,7 +807,7 @@ PHP_FUNCTION(html_entity_decode)
                return;
        }
 
-       replaced = php_unescape_html_entities(str, str_len, &len, 1, quote_style, hint_charset);
+       replaced = php_unescape_html_entities(str, str_len, &len, 1, quote_style, hint_charset TSRMLS_CC);
        RETVAL_STRINGL(replaced, len, 0);
 }
 /* }}} */
@@ -828,7 +828,7 @@ PHP_FUNCTION(get_html_translation_table)
        int which = HTML_SPECIALCHARS, quote_style = ENT_COMPAT;
        int i, j;
        char ind[2];
-       enum entity_charset charset = determine_charset(NULL);
+       enum entity_charset charset = determine_charset(NULL TSRMLS_CC);
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ll", &which, &quote_style) == FAILURE) {
                return;

diff --git a/ext/standard/html.h b/ext/standard/html.h
index 0f264328e9b81cb2c948c80df41047571c10d3bb..b083542217d0a3f7213cd4f616374203f1d4c975 100644 (file)
--- a/ext/standard/html.h
+++ b/ext/standard/html.h
@@ -36,6 +36,6 @@ PHP_FUNCTION(htmlentities);
 PHP_FUNCTION(html_entity_decode);
 PHP_FUNCTION(get_html_translation_table);
 
-PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset);
+PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset TSRMLS_DC);
 
 #endif /* HTML_H */

diff --git a/ext/wddx/php_wddx_api.h b/ext/wddx/php_wddx_api.h
index ce4b3f5b902dacddbb4767a34312bb5a1b7727a6..eb13ee385be73ee6aefc4fa62884ef4bf2c36d4b 100644 (file)
--- a/ext/wddx/php_wddx_api.h
+++ b/ext/wddx/php_wddx_api.h
@@ -59,7 +59,7 @@ void           php_wddx_destructor(wddx_packet *packet);
 void            php_wddx_packet_start(wddx_packet *packet, char *comment, int comment_len);
 void            php_wddx_packet_end(wddx_packet *packet);
 
-void            php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int name_len);
+void            php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int name_len TSRMLS_DC);
 int             php_wddx_deserialize_ex(char *, int, zval *return_value);
 #define php_wddx_gather(packet) estrndup(packet->c, packet->len)
 

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index ad540aab382f3b8a6f97d1fc1504f1c6a659acb4..6a7c9440355d32550458809f4d4a78e268bed08f 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -240,7 +240,7 @@ PS_SERIALIZER_ENCODE_FUNC(wddx)
        php_wddx_add_chunk_static(packet, WDDX_STRUCT_S);
        
        PS_ENCODE_LOOP(
-               php_wddx_serialize_var(packet, *struc, key, key_length);
+               php_wddx_serialize_var(packet, *struc, key, key_length TSRMLS_CC);
        );
        
        php_wddx_add_chunk_static(packet, WDDX_STRUCT_E);
@@ -495,7 +495,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
                                }
 
                                if (zend_hash_find(HASH_OF(obj), Z_STRVAL_PP(varname), Z_STRLEN_PP(varname)+1, (void **)&ent) == SUCCESS) {
-                                       php_wddx_serialize_var(packet, *ent, Z_STRVAL_PP(varname), Z_STRLEN_PP(varname));
+                                       php_wddx_serialize_var(packet, *ent, Z_STRVAL_PP(varname), Z_STRLEN_PP(varname) TSRMLS_CC);
                                }
                        }
                        
@@ -525,10 +525,10 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
                                continue;
 
                        if (zend_hash_get_current_key_ex(HASH_OF(obj), &key, &key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) {
-                               php_wddx_serialize_var(packet, *ent, key, key_len);
+                               php_wddx_serialize_var(packet, *ent, key, key_len TSRMLS_CC);
                        } else {
                                key_len = sprintf(tmp_buf, "%ld", idx);
-                               php_wddx_serialize_var(packet, *ent, tmp_buf, key_len);
+                               php_wddx_serialize_var(packet, *ent, tmp_buf, key_len TSRMLS_CC);
                        }
                }
                php_wddx_add_chunk_static(packet, WDDX_STRUCT_E);
@@ -596,13 +596,13 @@ static void php_wddx_serialize_array(wddx_packet *packet, zval *arr)
                        ent_type = zend_hash_get_current_key_ex(target_hash, &key, &key_len, &idx, 0, NULL);
 
                        if (ent_type == HASH_KEY_IS_STRING) {
-                               php_wddx_serialize_var(packet, *ent, key, key_len);
+                               php_wddx_serialize_var(packet, *ent, key, key_len TSRMLS_CC);
                        } else {
                                key_len = sprintf(tmp_buf, "%ld", idx);
-                               php_wddx_serialize_var(packet, *ent, tmp_buf, key_len);
+                               php_wddx_serialize_var(packet, *ent, tmp_buf, key_len TSRMLS_CC);
                        }
                } else
-                       php_wddx_serialize_var(packet, *ent, NULL, 0);
+                       php_wddx_serialize_var(packet, *ent, NULL, 0 TSRMLS_CC);
        }
        
        if (is_struct) {
@@ -615,14 +615,14 @@ static void php_wddx_serialize_array(wddx_packet *packet, zval *arr)
 
 /* {{{ php_wddx_serialize_var
  */
-void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int name_len)
+void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int name_len TSRMLS_DC)
 {
        char tmp_buf[WDDX_BUF_LEN];
        char *name_esc;
        int name_esc_len;
 
        if (name) {
-               name_esc = php_escape_html_entities(name, name_len, &name_esc_len, 0, ENT_QUOTES, NULL);
+               name_esc = php_escape_html_entities(name, name_len, &name_esc_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
                sprintf(tmp_buf, WDDX_VAR_S, name_esc);
                php_wddx_add_chunk(packet, tmp_buf);
                efree(name_esc);
@@ -673,7 +673,7 @@ static void php_wddx_add_var(wddx_packet *packet, zval *name_var)
        {
                if (zend_hash_find(EG(active_symbol_table), Z_STRVAL_P(name_var),
                                                        Z_STRLEN_P(name_var)+1, (void**)&val) != FAILURE) {
-                       php_wddx_serialize_var(packet, *val, Z_STRVAL_P(name_var), Z_STRLEN_P(name_var));
+                       php_wddx_serialize_var(packet, *val, Z_STRVAL_P(name_var), Z_STRLEN_P(name_var) TSRMLS_CC);
                }               
        }
        else if (Z_TYPE_P(name_var) == IS_ARRAY || Z_TYPE_P(name_var) == IS_OBJECT)
@@ -1114,7 +1114,7 @@ PHP_FUNCTION(wddx_serialize_value)
        }
 
        php_wddx_packet_start(packet, comment, comment_len);
-       php_wddx_serialize_var(packet, var, NULL, 0);
+       php_wddx_serialize_var(packet, var, NULL, 0 TSRMLS_CC);
        php_wddx_packet_end(packet);
                                        
        ZVAL_STRINGL(return_value, packet->c, packet->len, 1);