X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_querystring_api.c;h=4c45664b5aacbdcf982a32ef866c67719a2945b5;hb=5b55dee0720e8969d8b6ddd7fa3ef7a7f415abcc;hp=a15a0db85e884a4f887ab6b0edecf108ca818a5e;hpb=24d2d35cd00eca44a97a6b11340c2790421216fa;p=m6w6%2Fext-http

diff --git a/http_querystring_api.c b/http_querystring_api.c
index a15a0db..4c45664 100644
--- a/http_querystring_api.c
+++ b/http_querystring_api.c
@@ -16,7 +16,7 @@
 #include "php_http.h"
 
 #include "php_variables.h"
-#ifdef HAVE_ICONV
+#ifdef HTTP_HAVE_ICONV
 #	undef PHP_ATOM_INC
 #	include "ext/iconv/php_iconv.h"
 #	include "ext/standard/url.h"
@@ -31,7 +31,14 @@
 extern zend_class_entry *http_querystring_object_ce;
 #endif
 
-#ifdef HAVE_ICONV
+
+#define http_querystring_modify_array_ex(q, t, k, kl, i, pe) _http_querystring_modify_array_ex((q), (t), (k), (kl), (i), (pe) TSRMLS_CC)
+static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC);
+#define http_querystring_modify_array(q, p) _http_querystring_modify_array((q), (p) TSRMLS_CC)
+static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC);
+
+
+#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;
@@ -105,7 +112,59 @@ PHP_HTTP_API void _http_querystring_update(zval *qarray, zval *qstring TSRMLS_DC
 	}
 }
 
-PHP_HTTP_API int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC)
+PHP_HTTP_API int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC)
+{
+	if (Z_TYPE_P(params) == IS_ARRAY) {
+		return http_querystring_modify_array(qarray, params);
+	} else if (Z_TYPE_P(params) == IS_OBJECT) {
+#ifdef ZEND_ENGINE_2
+		if (!instanceof_function(Z_OBJCE_P(params), http_querystring_object_ce TSRMLS_CC)) {
+#endif
+			zval temp_array;
+			INIT_ZARR(temp_array, HASH_OF(params));
+			return http_querystring_modify_array(qarray, &temp_array);
+#ifdef ZEND_ENGINE_2
+		}
+		return http_querystring_modify_array(qarray, GET_PROP_EX(params, queryArray));
+#endif
+	} else {
+		int rv;
+		zval array;
+		
+		INIT_PZVAL(&array);
+		array_init(&array);
+		
+		ZVAL_ADDREF(params);
+		convert_to_string_ex(&params);
+		sapi_module.treat_data(PARSE_STRING, estrdup(Z_STRVAL_P(params)), &array TSRMLS_CC);
+		zval_ptr_dtor(&params);
+		rv = http_querystring_modify_array(qarray, &array);
+		zval_dtor(&array);
+		return rv;
+	}
+}
+
+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;
+	HashPosition pos;
+	zval **params_entry = NULL;
+	
+	FOREACH_KEYLENVAL(pos, params, key, keylen, idx, params_entry) {
+		/* only public properties */
+		if ((!key || *key) && http_querystring_modify_array_ex(qarray, key ? HASH_KEY_IS_STRING : HASH_KEY_IS_LONG, key, keylen, idx, *params_entry)) {
+			rv = 1;
+		}
+		key = NULL;
+	}
+	
+	return rv;
+}
+
+static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC)
 {
 	zval **qarray_entry;
 	
@@ -124,8 +183,8 @@ PHP_HTTP_API int _http_querystring_modify_array_ex(zval *qarray, int key_type, c
 		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)) {
@@ -135,6 +194,9 @@ PHP_HTTP_API int _http_querystring_modify_array_ex(zval *qarray, int key_type, c
 	
 	/* 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 {
@@ -143,57 +205,6 @@ PHP_HTTP_API int _http_querystring_modify_array_ex(zval *qarray, int key_type, c
 	return 1;
 }
 
-PHP_HTTP_API int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC)
-{
-	int rv = 0;
-	char *key = NULL;
-	uint keylen = 0;
-	ulong idx = 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)) {
-			rv = 1;
-		}
-		key = NULL;
-	}
-	
-	return rv;
-}
-
-PHP_HTTP_API int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC)
-{
-	if (Z_TYPE_P(params) == IS_ARRAY) {
-		return http_querystring_modify_array(qarray, params);
-	} else if (Z_TYPE_P(params) == IS_OBJECT) {
-#ifdef ZEND_ENGINE_2
-		if (!instanceof_function(Z_OBJCE_P(params), http_querystring_object_ce TSRMLS_CC)) {
-#endif
-			zval temp_array;
-			INIT_ZARR(temp_array, HASH_OF(params));
-			return http_querystring_modify_array(qarray, &temp_array);
-#ifdef ZEND_ENGINE_2
-		}
-		return http_querystring_modify_array(qarray, GET_PROP_EX(params, queryArray));
-#endif
-	} else {
-		int rv;
-		zval array;
-		
-		INIT_PZVAL(&array);
-		array_init(&array);
-		
-		ZVAL_ADDREF(params);
-		convert_to_string_ex(&params);
-		sapi_module.treat_data(PARSE_STRING, estrdup(Z_STRVAL_P(params)), &array TSRMLS_CC);
-		zval_ptr_dtor(&params);
-		rv = http_querystring_modify_array(qarray, &array);
-		zval_dtor(&array);
-		return rv;
-	}
-}
-
 /*
  * Local variables:
  * tab-width: 4