fix test

[m6w6/ext-http] / php_http_params.c

diff --git a/php_http_params.c b/php_http_params.c
index ced2507aea8e470ebbfe7e7fc0585ab81f97b43e..b6610cfe63902d38f2467a35d39df3bf5a3b076a 100644 (file)
--- a/php_http_params.c
+++ b/php_http_params.c
@@ -315,7 +315,7 @@ static inline void sanitize_rfc5987(zval *zv, char **language, zend_bool *latin1
        }
 }
 
-static inline void sanitize_rfc5988(char *str, size_t len, zval *zv TSRMLS_DC)
+static inline void sanitize_rfc5988(char *str, size_t len, zval *zv)
 {
        zend_string *zs = zend_string_init(str, len, 0);
 
@@ -324,7 +324,7 @@ static inline void sanitize_rfc5988(char *str, size_t len, zval *zv TSRMLS_DC)
        zend_string_release(zs);
 }
 
-static inline void prepare_rfc5988(zval *zv TSRMLS_DC)
+static inline void prepare_rfc5988(zval *zv)
 {
        if (Z_TYPE_P(zv) != IS_STRING) {
                zval_dtor(zv);
@@ -437,7 +437,7 @@ static void merge_param(HashTable *params, zval *zdata, zval **current_param, zv
                zval tmp;
                INIT_PZVAL_ARRAY(&tmp, params);
                fprintf(stderr, "params = ");
-               zend_print_zval_r(&tmp, 1 TSRMLS_CC);
+               zend_print_zval_r(&tmp, 1);
                fprintf(stderr, "\n");
        }
 #endif
@@ -904,7 +904,6 @@ static void shift_param(php_http_buffer_t *buf, char *key_str, size_t key_len, z
                        shift_arg(buf, key_str, key_len, zvalue, ass, asl, vss, vsl, flags);
                }
        } else {
-               shift_key(buf, key_str, key_len, pss, psl, flags);
                if (flags & PHP_HTTP_PARAMS_RFC5988) {
                        shift_rfc5988(buf, key_str, key_len, pss, psl, flags);
                } else {
@@ -1112,7 +1111,7 @@ PHP_METHOD(HttpParams, toArray)
                return;
        }
        zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp);
-       RETURN_ZVAL_FAST(zparams);
+       RETURN_ZVAL(zparams, 1, 0);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_toString, 0, 0, 0)
@@ -1194,7 +1193,7 @@ PHP_METHOD(HttpParams, offsetGet)
        zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp);
 
        if (Z_TYPE_P(zparams) == IS_ARRAY && (zparam = zend_symtable_find(Z_ARRVAL_P(zparams), name))) {
-               RETVAL_ZVAL_FAST(zparam);
+               RETVAL_ZVAL(zparam, 1, 0);
        }
 }
 
@@ -1226,7 +1225,7 @@ PHP_METHOD(HttpParams, offsetSet)
        zend_string *name;
        zval zparams_tmp, *zparam, *zparams, *nvalue;
 
-       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz", &name, &nvalue)) {
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "Sz", &name, &nvalue)) {
                return;
        }