X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env_request.c;h=ac0a5e4d23ebe31400f180b4c36512b764736c72;hp=4313370cf4e1fa64a512e039c1a41a148f57c0c7;hb=refs%2Fheads%2Fv2.3.x;hpb=cdfa5298b064787eebbdce77a46b5ae77b3617ae

diff --git a/php_http_env_request.c b/php_http_env_request.c
index 4313370..ac0a5e4 100644
--- a/php_http_env_request.c
+++ b/php_http_env_request.c
@@ -6,35 +6,12 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 #include "php_http_api.h"
 
-
-zend_class_entry *php_http_env_request_class_entry;
-
-#undef PHP_HTTP_BEGIN_ARGS
-#undef PHP_HTTP_EMPTY_ARGS
-#define PHP_HTTP_BEGIN_ARGS(method, req_args) 		PHP_HTTP_BEGIN_ARGS_EX(HttpEnvRequest, method, 0, req_args)
-#define PHP_HTTP_EMPTY_ARGS(method)					PHP_HTTP_EMPTY_ARGS_EX(HttpEnvRequest, method, 0)
-#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(getPost);
-PHP_HTTP_EMPTY_ARGS(getQuery);
-PHP_HTTP_EMPTY_ARGS(getFiles);
-
-zend_function_entry php_http_env_request_method_entry[] = {
-	PHP_HTTP_ENV_REQUEST_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_HTTP_ENV_REQUEST_ME(getPost, ZEND_ACC_PUBLIC)
-	PHP_HTTP_ENV_REQUEST_ME(getQuery, ZEND_ACC_PUBLIC)
-	PHP_HTTP_ENV_REQUEST_ME(getFiles, ZEND_ACC_PUBLIC)
-
-	EMPTY_FUNCTION_ENTRY
-};
-
 static int grab_file(void *zpp TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
 {
 	zval *zfiles, **name, **zname, **error, **zerror, **type, **ztype, **size, **zsize, **tmp_name = zpp;
@@ -52,7 +29,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);
@@ -68,7 +45,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;
@@ -110,89 +96,184 @@ static int grab_files(void *zpp TSRMLS_DC, int argc, va_list argv, zend_hash_key
 				add_assoc_zval_ex(cpy, ZEND_STRS("file"), *tmp);
 				zend_hash_del_key_or_index(Z_ARRVAL_P(cpy), ZEND_STRS("tmp_name"), 0, HASH_DEL_KEY);
 			}
-			zend_hash_quick_update(Z_ARRVAL_P(zfiles), key->arKey, key->nKeyLength, key->h, (void *) &cpy, sizeof(zval *), NULL);
+			if (key->nKeyLength > 0) {
+				zend_hash_quick_update(Z_ARRVAL_P(zfiles), key->arKey, key->nKeyLength, key->h, (void *) &cpy, sizeof(zval *), NULL);
+			} else {
+				zend_hash_index_update(Z_ARRVAL_P(zfiles), key->h, (void *) &cpy, sizeof(zval *), NULL);
+			}
 		}
 	}
 
 	return ZEND_HASH_APPLY_KEEP;
 }
 
-PHP_METHOD(HttpEnvRequest, __construct)
-{
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
-		if (SUCCESS == zend_parse_parameters_none()) {
-			php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-			zval *zsg;
-
-			obj->message = php_http_message_init_env(obj->message, PHP_HTTP_REQUEST TSRMLS_CC);
-
-			if ((zsg = php_http_env_get_superglobal(ZEND_STRL("_GET") TSRMLS_CC))) {
-				zval *zquery;
-
-				MAKE_STD_ZVAL(zquery);
-				object_init_ex(zquery, php_http_querystring_class_entry);
-				if (SUCCESS == php_http_querystring_ctor(zquery, zsg TSRMLS_CC)) {
-					zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("query"), zquery TSRMLS_CC);
-				}
-				zval_ptr_dtor(&zquery);
-			}
-			if ((zsg = php_http_env_get_superglobal(ZEND_STRL("_POST") TSRMLS_CC))) {
-				zval *zpost;
-
-				MAKE_STD_ZVAL(zpost);
-				object_init_ex(zpost, php_http_querystring_class_entry);
-				if (SUCCESS == php_http_querystring_ctor(zpost, zsg TSRMLS_CC)) {
-					zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("post"), zpost TSRMLS_CC);
-				}
-				zval_ptr_dtor(&zpost);
-			}
-			if ((zsg = php_http_env_get_superglobal(ZEND_STRL("_FILES") TSRMLS_CC))) {
-				zval *zfiles;
+#define PHP_HTTP_ENV_REQUEST_OBJECT_INIT(obj) \
+	do { \
+		if (!obj->message) { \
+			obj->message = php_http_message_init_env(NULL, PHP_HTTP_REQUEST TSRMLS_CC); \
+		} \
+	} while(0)
 
-				MAKE_STD_ZVAL(zfiles);
-				array_init(zfiles);
-				zend_hash_apply_with_arguments(Z_ARRVAL_P(zsg) TSRMLS_CC, grab_files, 1, zfiles);
 
-				zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("files"), zfiles TSRMLS_CC);
-				zval_ptr_dtor(&zfiles);
-			}
-		}
-	} end_error_handling();
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvRequest___construct, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnvRequest, __construct)
+{
+	php_http_message_object_t *obj;
+	zval *zsg, *zqs;
+
+	php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
+
+	obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+	obj->body = NULL;
+
+	php_http_expect(obj->message = php_http_message_init_env(obj->message, PHP_HTTP_REQUEST TSRMLS_CC), unexpected_val, return);
+
+	zsg = php_http_env_get_superglobal(ZEND_STRL("_GET") TSRMLS_CC);
+	MAKE_STD_ZVAL(zqs);
+	object_init_ex(zqs, php_http_querystring_class_entry);
+	php_http_expect(SUCCESS == php_http_querystring_ctor(zqs, zsg TSRMLS_CC), unexpected_val,
+			zval_ptr_dtor(&zqs);
+			return;
+	);
+	zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("query"), zqs TSRMLS_CC);
+	zval_ptr_dtor(&zqs);
+
+	zsg = php_http_env_get_superglobal(ZEND_STRL("_POST") TSRMLS_CC);
+	MAKE_STD_ZVAL(zqs);
+	object_init_ex(zqs, php_http_querystring_class_entry);
+	php_http_expect(SUCCESS == php_http_querystring_ctor(zqs, zsg TSRMLS_CC), unexpected_val,
+			zval_ptr_dtor(&zqs);
+			return;
+	);
+	zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("form"), zqs TSRMLS_CC);
+	zval_ptr_dtor(&zqs);
+
+	zsg = php_http_env_get_superglobal(ZEND_STRL("_COOKIE") TSRMLS_CC);
+	MAKE_STD_ZVAL(zqs);
+	object_init_ex(zqs, php_http_querystring_class_entry);
+	php_http_expect(SUCCESS == php_http_querystring_ctor(zqs, zsg TSRMLS_CC), unexpected_val,
+			zval_ptr_dtor(&zqs);
+			return;
+	);
+	zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("cookie"), zqs TSRMLS_CC);
+	zval_ptr_dtor(&zqs);
+
+	MAKE_STD_ZVAL(zqs);
+	array_init(zqs);
+	if ((zsg = php_http_env_get_superglobal(ZEND_STRL("_FILES") TSRMLS_CC))) {
+		zend_hash_apply_with_arguments(Z_ARRVAL_P(zsg) TSRMLS_CC, grab_files, 1, zqs);
+	}
+	zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("files"), zqs TSRMLS_CC);
+	zval_ptr_dtor(&zqs);
 }
 
-PHP_METHOD(HttpEnvRequest, getPost)
+#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);
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvRequest_getForm, 0, 0, 0)
+	ZEND_ARG_INFO(0, name)
+	ZEND_ARG_INFO(0, type)
+	ZEND_ARG_INFO(0, defval)
+	ZEND_ARG_INFO(0, delete)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnvRequest, getForm)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
-		RETURN_PROP(php_http_env_request_class_entry, "post");
+	if (ZEND_NUM_ARGS()) {
+		call_querystring_get("form");
+	} else {
+		zval *zform = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("form"), 0 TSRMLS_CC);
+		RETURN_ZVAL(zform, 1, 0);
 	}
 }
 
-PHP_METHOD(HttpEnvRequest, getQuery)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvRequest_getQuery, 0, 0, 0)
+	ZEND_ARG_INFO(0, name)
+	ZEND_ARG_INFO(0, type)
+	ZEND_ARG_INFO(0, defval)
+	ZEND_ARG_INFO(0, delete)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnvRequest, getQuery)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
-		RETURN_PROP(php_http_env_request_class_entry, "query");
+	if (ZEND_NUM_ARGS()) {
+		call_querystring_get("query");
+	} else {
+		zval *zquery = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("query"), 0 TSRMLS_CC);
+		RETURN_ZVAL(zquery, 1, 0);
+	}
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvRequest_getCookie, 0, 0, 0)
+	ZEND_ARG_INFO(0, name)
+	ZEND_ARG_INFO(0, type)
+	ZEND_ARG_INFO(0, defval)
+	ZEND_ARG_INFO(0, delete)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnvRequest, getCookie)
+{
+	if (ZEND_NUM_ARGS()) {
+		call_querystring_get("cookie");
+	} else {
+		zval *zcookie = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("cookie"), 0 TSRMLS_CC);
+		RETURN_ZVAL(zcookie, 1, 0);
 	}
 }
 
-PHP_METHOD(HttpEnvRequest, getFiles)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvRequest_getFiles, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnvRequest, getFiles)
 {
 	if (SUCCESS == zend_parse_parameters_none()) {
-		RETURN_PROP(php_http_env_request_class_entry, "files");
+		zval *zfiles = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("files"), 0 TSRMLS_CC);
+		RETURN_ZVAL(zfiles, 1, 0);
 	}
 }
 
+static zend_function_entry php_http_env_request_methods[] = {
+	PHP_ME(HttpEnvRequest, __construct,  ai_HttpEnvRequest___construct,  ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(HttpEnvRequest, getForm,      ai_HttpEnvRequest_getForm,      ZEND_ACC_PUBLIC)
+	PHP_ME(HttpEnvRequest, getQuery,     ai_HttpEnvRequest_getQuery,     ZEND_ACC_PUBLIC)
+	PHP_ME(HttpEnvRequest, getCookie,    ai_HttpEnvRequest_getCookie,    ZEND_ACC_PUBLIC)
+	PHP_ME(HttpEnvRequest, getFiles,     ai_HttpEnvRequest_getFiles,     ZEND_ACC_PUBLIC)
+	EMPTY_FUNCTION_ENTRY
+};
+
+zend_class_entry *php_http_env_request_class_entry;
 
 PHP_MINIT_FUNCTION(http_env_request)
 {
-	PHP_HTTP_REGISTER_CLASS(http\\Env, Request, http_env_request, php_http_message_class_entry, 0);
+	zend_class_entry ce = {0};
+
+	INIT_NS_CLASS_ENTRY(ce, "http\\Env", "Request", php_http_env_request_methods);
+	php_http_env_request_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry, NULL TSRMLS_CC);
+
 	zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("query"), ZEND_ACC_PROTECTED TSRMLS_CC);
-	zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("post"), ZEND_ACC_PROTECTED TSRMLS_CC);
+	zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("form"), ZEND_ACC_PROTECTED TSRMLS_CC);
+	zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("cookie"), ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("files"), ZEND_ACC_PROTECTED TSRMLS_CC);
 
 	return SUCCESS;
 }
 
-
 /*
  * Local variables:
  * tab-width: 4