- improve internal array handling

[m6w6/ext-http] / http_querystring_api.c

diff --git a/http_querystring_api.c b/http_querystring_api.c
index 03fe7266618b554145dba6a5004a7484d115edc0..09a767f5ca67e4ae5312209958a823ae73734188 100644 (file)
--- a/http_querystring_api.c
+++ b/http_querystring_api.c
@@ -16,7 +16,7 @@
 #include "php_http.h"
 
 #include "php_variables.h"
-#if HTTP_HAVE_EXT(ICONV)
+#ifdef HTTP_HAVE_ICONV
 #      undef PHP_ATOM_INC
 #      include "ext/iconv/php_iconv.h"
 #      include "ext/standard/url.h"
@@ -38,57 +38,55 @@ static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type,
 static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC);
 
 
-#if HTTP_HAVE_EXT(ICONV)
+#ifdef HTTP_HAVE_ICONV
 PHP_HTTP_API int _http_querystring_xlate(zval *array, zval *param, const char *ie, const char *oe TSRMLS_DC)
 {
        HashPosition pos;
        zval **entry = NULL;
-       char *xlate_str = NULL, *xkey, *kstr = NULL;
+       char *xlate_str = NULL, *xkey;
        size_t xlate_len = 0, xlen;
-       uint klen = 0;
-       ulong kidx = 0;
+       HashKey key = initHashKey(0);
        
-       FOREACH_KEYLENVAL(pos, param, kstr, klen, kidx, entry) {
-               if (kstr) {
-                       if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(kstr, klen-1, &xkey, &xlen, oe, ie)) {
-                               http_error_ex(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", klen-1, kstr, ie, oe);
+       FOREACH_KEYVAL(pos, param, key, entry) {
+               if (key.type == HASH_KEY_IS_STRING) {
+                       if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.str, key.len-1, &xkey, &xlen, oe, ie)) {
+                               http_error_ex(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", key.len-1, key.str, ie, oe);
                                return FAILURE;
                        }
                }
                
                if (Z_TYPE_PP(entry) == IS_STRING) {
                        if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), &xlate_str, &xlate_len, oe, ie)) {
-                               if (kstr) {
+                               if (key.type == HASH_KEY_IS_STRING) {
                                        efree(xkey);
                                }
                                http_error_ex(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", Z_STRLEN_PP(entry), Z_STRVAL_PP(entry), ie, oe);
                                return FAILURE;
                        }
-                       if (kstr) {
+                       if (key.type == HASH_KEY_IS_STRING) {
                                add_assoc_stringl_ex(array, xkey, xlen+1, xlate_str, xlate_len, 0);
                        } else {
-                               add_index_stringl(array, kidx, xlate_str, xlate_len, 0);
+                               add_index_stringl(array, key.num, xlate_str, xlate_len, 0);
                        }
                } else if (Z_TYPE_PP(entry) == IS_ARRAY) {
                        zval *subarray;
                        
                        MAKE_STD_ZVAL(subarray);
                        array_init(subarray);
-                       if (kstr) {
+                       if (key.type == HASH_KEY_IS_STRING) {
                                add_assoc_zval_ex(array, xkey, xlen+1, subarray);
                        } else {
-                               add_index_zval(array, kidx, subarray);
+                               add_index_zval(array, key.num, subarray);
                        }
                        if (SUCCESS != http_querystring_xlate(subarray, *entry, ie, oe)) {
-                               if (kstr) {
+                               if (key.type == HASH_KEY_IS_STRING) {
                                        efree(xkey);
                                }
                                return FAILURE;
                        }
                }
                
-               if (kstr) {
-                       kstr = NULL;
+               if (key.type == HASH_KEY_IS_STRING) {
                        efree(xkey);
                }
        }
@@ -147,17 +145,15 @@ PHP_HTTP_API int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC)
 static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC)
 {
        int rv = 0;
-       char *key = NULL;
-       uint keylen = 0;
-       ulong idx = 0;
+       HashKey key = initHashKey(0);
        HashPosition pos;
        zval **params_entry = NULL;
        
-       FOREACH_KEYLENVAL(pos, params, key, keylen, idx, params_entry) {
-               if (http_querystring_modify_array_ex(qarray, key ? HASH_KEY_IS_STRING : HASH_KEY_IS_LONG, key, keylen, idx, *params_entry)) {
+       FOREACH_KEYVAL(pos, params, key, params_entry) {
+               /* only public properties */
+               if ((key.type != HASH_KEY_IS_STRING || *key.str) && http_querystring_modify_array_ex(qarray, key.type, key.str, key.len, key.num, *params_entry)) {
                        rv = 1;
                }
-               key = NULL;
        }
        
        return rv;
@@ -182,8 +178,8 @@ static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type,
                zval equal;
                
                /* recursive */
-               if (Z_TYPE_P(params_entry) == IS_ARRAY) {
-                       return http_querystring_modify_array(*qarray_entry, params_entry);
+               if (Z_TYPE_P(params_entry) == IS_ARRAY || Z_TYPE_P(params_entry) == IS_OBJECT) {
+                       return http_querystring_modify(*qarray_entry, params_entry);
                }
                /* equal */
                if ((SUCCESS == is_equal_function(&equal, *qarray_entry, params_entry TSRMLS_CC)) && Z_BVAL(equal)) {
@@ -193,6 +189,9 @@ static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type,
        
        /* add */
        ZVAL_ADDREF(params_entry);
+       if (Z_TYPE_P(params_entry) == IS_OBJECT) {
+               convert_to_array_ex(&params_entry);
+       }
        if (key_type == HASH_KEY_IS_STRING) {
                add_assoc_zval_ex(qarray, key, keylen, params_entry);
        } else {