X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_params.c;h=3ec71b1ddfd83f0d0b9465a26340dc6af903520c;hb=d5d88f419c63a98f7cdef991e63f37b17f9ae413;hp=8988f43c65c0cd33dcd9ff7220304c0c4065d7bd;hpb=faf7a7899fa8ffb24f8105a921f359d6b97ec34e;p=m6w6%2Fext-http

diff --git a/src/php_http_params.c b/src/php_http_params.c
index 8988f43..3ec71b1 100644
--- a/src/php_http_params.c
+++ b/src/php_http_params.c
@@ -118,7 +118,7 @@ static inline void prepare_escaped(zval *zv)
 
 static inline void sanitize_urlencoded(zval *zv)
 {
-	Z_STRLEN_P(zv) = php_raw_url_decode(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
+	Z_STRLEN_P(zv) = php_url_decode(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
 }
 
 static inline void prepare_urlencoded(zval *zv)
@@ -489,7 +489,7 @@ static void merge_param(HashTable *params, zval *zdata, zval **current_param, zv
 			zval *test_ptr;
 
 			while (Z_TYPE_P(zdata_ptr) == IS_ARRAY && (test_ptr = zend_hash_get_current_data(Z_ARRVAL_P(zdata_ptr)))) {
-				if (Z_TYPE_P(test_ptr) == IS_ARRAY) {
+				if (Z_TYPE_P(test_ptr) == IS_ARRAY && Z_TYPE_P(ptr) == IS_ARRAY) {
 					zval *tmp_ptr = ptr;
 
 					/* now find key in ptr */