X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_querystring.c;h=f2164fb56ab7d860bdff9510a572f2bad111c605;hp=7304d6915f31420608bc2d15543ed8166ef0463e;hb=refs%2Fheads%2Fv2.3.x;hpb=8b8cdb96032f50d57dbdad74ae45336d01a7f0c5

diff --git a/php_http_querystring.c b/php_http_querystring.c
index 7304d69..f2164fb 100644
--- a/php_http_querystring.c
+++ b/php_http_querystring.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -606,11 +606,19 @@ PHP_METHOD(HttpQueryString, offsetSet)
 		return;
 	}
 
-	MAKE_STD_ZVAL(param);
-	array_init(param);
-	Z_ADDREF_P(value);
-	add_assoc_zval_ex(param, offset_str, offset_len + 1, value);
-	php_http_querystring_set(getThis(), param, 0 TSRMLS_CC);
+	param = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC);
+
+	if (Z_TYPE_P(param) == IS_ARRAY && zend_symtable_exists(Z_ARRVAL_P(param), offset_str, offset_len + 1)) {
+		Z_ADDREF_P(value);
+		zend_symtable_update(Z_ARRVAL_P(param), offset_str, offset_len + 1, (void *) &value, sizeof(zval *), NULL);
+		Z_ADDREF_P(param);
+	} else {
+		MAKE_STD_ZVAL(param);
+		array_init(param);
+		Z_ADDREF_P(value);
+		add_assoc_zval_ex(param, offset_str, offset_len + 1, value);
+	}
+	php_http_querystring_set(getThis(), param, QS_MERGE TSRMLS_CC);
 	zval_ptr_dtor(&param);
 }