X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env_request.c;h=4da183ec6fa144ac77be4cf3569d207d37fbce82;hp=701e9fda8f1f08dd88a4207d7e2f775e348e5485;hb=7ba90c6d9d6843549fb9227d1a7aa05033e60772;hpb=729594cae203b09419d195ec0dabde0430c9f1cd

diff --git a/php_http_env_request.c b/php_http_env_request.c
index 701e9fd..4da183e 100644
--- a/php_http_env_request.c
+++ b/php_http_env_request.c
@@ -20,8 +20,21 @@
 #define PHP_HTTP_ENV_REQUEST_ME(method, visibility)	PHP_ME(HttpEnvRequest, method, PHP_HTTP_ARGS(HttpEnvRequest, method), visibility)
 
 PHP_HTTP_EMPTY_ARGS(__construct);
-PHP_HTTP_EMPTY_ARGS(getForm);
-PHP_HTTP_EMPTY_ARGS(getQuery);
+
+PHP_HTTP_BEGIN_ARGS(getQuery, 0)
+	PHP_HTTP_ARG_VAL(name, 0)
+	PHP_HTTP_ARG_VAL(type, 0)
+	PHP_HTTP_ARG_VAL(defval, 0)
+	PHP_HTTP_ARG_VAL(delete, 0)
+PHP_HTTP_END_ARGS;
+
+PHP_HTTP_BEGIN_ARGS(getForm, 0)
+	PHP_HTTP_ARG_VAL(name, 0)
+	PHP_HTTP_ARG_VAL(type, 0)
+	PHP_HTTP_ARG_VAL(defval, 0)
+	PHP_HTTP_ARG_VAL(delete, 0)
+PHP_HTTP_END_ARGS;
+
 PHP_HTTP_EMPTY_ARGS(getFiles);
 
 static zend_class_entry *php_http_env_request_class_entry;
@@ -57,7 +70,7 @@ static int grab_file(void *zpp TSRMLS_DC, int argc, va_list argv, zend_hash_key
 	&&	SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(type), key->h, (void *) &ztype)
 	&&	SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(error), key->h, (void *) &zerror)
 	) {
-		zval *entry;
+		zval *entry, **array;
 
 		MAKE_STD_ZVAL(entry);
 		array_init(entry);
@@ -73,7 +86,16 @@ static int grab_file(void *zpp TSRMLS_DC, int argc, va_list argv, zend_hash_key
 		Z_ADDREF_PP(zerror);
 		add_assoc_zval_ex(entry, ZEND_STRS("error"), *zerror);
 
-		zend_hash_quick_update(Z_ARRVAL_P(zfiles), file_key->arKey, file_key->nKeyLength, file_key->h, (void *) &entry, sizeof(zval *), NULL);
+		if (SUCCESS == zend_hash_quick_find(Z_ARRVAL_P(zfiles), file_key->arKey, file_key->nKeyLength, file_key->h, (void *) &array)) {
+			add_next_index_zval(*array, entry);
+		} else {
+			zval *tmp;
+
+			MAKE_STD_ZVAL(tmp);
+			array_init(tmp);
+			add_next_index_zval(tmp, entry);
+			zend_hash_quick_update(Z_ARRVAL_P(zfiles), file_key->arKey, file_key->nKeyLength, file_key->h, (void *) &tmp, sizeof(zval *), NULL);
+		}
 	}
 
 	return ZEND_HASH_APPLY_KEEP;
@@ -160,16 +182,42 @@ PHP_METHOD(HttpEnvRequest, __construct)
 	} end_error_handling();
 }
 
+#define call_querystring_get(prop) \
+	do {\
+		zend_fcall_info fci; \
+		zend_fcall_info_cache fcc; \
+		zval *rv, mn, ***args = ecalloc(sizeof(zval **), ZEND_NUM_ARGS()); \
+		zval *qs = zend_read_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL(prop), 0 TSRMLS_CC); \
+		 \
+		INIT_PZVAL(&mn); \
+		array_init(&mn); \
+		Z_ADDREF_P(qs); \
+		add_next_index_zval(&mn, qs); \
+		add_next_index_stringl(&mn, ZEND_STRL("get"), 1); \
+		zend_fcall_info_init(&mn, 0, &fci, &fcc, NULL, NULL TSRMLS_CC); \
+		zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args); \
+		zend_fcall_info_argp(&fci TSRMLS_CC, ZEND_NUM_ARGS(), args); \
+		zend_fcall_info_call(&fci, &fcc, &rv, NULL TSRMLS_CC); \
+		zend_fcall_info_args_clear(&fci, 1); \
+		efree(args); \
+		zval_dtor(&mn); \
+		RETVAL_ZVAL(rv, 0, 1); \
+	} while(0);
+
 PHP_METHOD(HttpEnvRequest, getForm)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
+	if (ZEND_NUM_ARGS()) {
+		call_querystring_get("form");
+	} else {
 		RETURN_PROP(php_http_env_request_class_entry, "form");
 	}
 }
 
 PHP_METHOD(HttpEnvRequest, getQuery)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
+	if (ZEND_NUM_ARGS()) {
+		call_querystring_get("query");
+	} else {
 		RETURN_PROP(php_http_env_request_class_entry, "query");
 	}
 }