#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_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_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;
+
+zend_class_entry *php_http_env_request_get_class_entry(void)
+{
+ return php_http_env_request_class_entry;
+}
+
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(getForm, ZEND_ACC_PUBLIC)
PHP_HTTP_ENV_REQUEST_ME(getQuery, ZEND_ACC_PUBLIC)
PHP_HTTP_ENV_REQUEST_ME(getFiles, ZEND_ACC_PUBLIC)
&& 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);
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;
return ZEND_HASH_APPLY_KEEP;
}
+#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)
+
PHP_METHOD(HttpEnvRequest, __construct)
{
- with_error_handling(EH_THROW, php_http_exception_class_entry) {
+ with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
+ php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
if (SUCCESS == zend_parse_parameters_none()) {
- php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- zval *zsg;
+ zval *zsg, *zqs;
obj->message = php_http_message_init_env(obj->message, PHP_HTTP_REQUEST TSRMLS_CC);
+ obj->body.handle = 0;
- 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);
+ zsg = php_http_env_get_superglobal(ZEND_STRL("_GET") TSRMLS_CC);
+ MAKE_STD_ZVAL(zqs);
+ object_init_ex(zqs, php_http_querystring_get_class_entry());
+ if (SUCCESS == php_http_querystring_ctor(zqs, zsg TSRMLS_CC)) {
+ zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("query"), zqs TSRMLS_CC);
}
- 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);
+ 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_get_class_entry());
+ if (SUCCESS == php_http_querystring_ctor(zqs, zsg TSRMLS_CC)) {
+ zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("form"), 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))) {
- zval *zfiles;
-
- 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);
+ 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_HTTP_ENV_REQUEST_OBJECT_INIT(obj);
} end_error_handling();
}
-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);
+
+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 {
+ 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");
}
}
PHP_MINIT_FUNCTION(http_env_request)
{
- PHP_HTTP_REGISTER_CLASS(http\\Env, Request, http_env_request, php_http_message_class_entry, 0);
+ PHP_HTTP_REGISTER_CLASS(http\\Env, Request, http_env_request, php_http_message_get_class_entry(), 0);
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("files"), ZEND_ACC_PROTECTED TSRMLS_CC);
return SUCCESS;
projects / m6w6 / ext-http / blobdiff