hashtable==zend_array now

[m6w6/ext-http] / php_http_env.c

diff --git a/php_http_env.c b/php_http_env.c
index 99ea0e00f4d8732c8ac7261e480d2d8c1f54b5f8..311541d7102ee095f480c8108d1a8e3f33452add 100644 (file)
--- a/php_http_env.c
+++ b/php_http_env.c
@@ -56,7 +56,7 @@ PHP_RINIT_FUNCTION(http_env)
                                         * array_init(&PG(http_globals)[TRACK_VARS_FILES])
                                         */
                                        Z_TRY_ADDREF(PG(http_globals)[TRACK_VARS_FILES]);
-                                       zend_hash_str_update(&EG(symbol_table).ht, "_FILES", lenof("_FILES"), &PG(http_globals)[TRACK_VARS_FILES]);
+                                       zend_hash_str_update(&EG(symbol_table), "_FILES", lenof("_FILES"), &PG(http_globals)[TRACK_VARS_FILES]);
                                }
                        }
                        zend_hash_destroy(&params);
@@ -177,7 +177,7 @@ zval *php_http_env_get_superglobal(const char *key, size_t key_len)
        zend_string *key_str = zend_string_init(key, key_len, 0);
 
        zend_is_auto_global(key_str);
-       hsv = zend_hash_find(&EG(symbol_table).ht, key_str);
+       hsv = zend_hash_find(&EG(symbol_table), key_str);
        zend_string_release(key_str);
 
        if (Z_TYPE_P(hsv) != IS_ARRAY) {
@@ -530,7 +530,7 @@ ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const ch
                zval *data_ptr;
                HashTable *ht = HASH_OF(value);
 
-               ZEND_HASH_FOREACH_VAL(ht, data_ptr)
+               ZEND_HASH_FOREACH_VAL_IND(ht, data_ptr)
                {
                        if (SUCCESS != php_http_env_set_response_header_value(http_code, name_str, name_len, data_ptr, first)) {
                                return FAILURE;