| 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-2013, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
# include <ext/iconv/php_iconv.h>
#endif
-
#define QS_MERGE 1
static inline void php_http_querystring_set(zval *instance, zval *params, int flags TSRMLS_DC)
return SUCCESS;
}
+static int apply_querystring(void *pData TSRMLS_DC)
+{
+ zval **val = pData;
+
+ if (Z_TYPE_PP(val) == IS_ARRAY) {
+ zval **zvalue;
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(val), ZEND_STRS("value"), (void *) &zvalue)) {
+ zval *tmp = *val;
+
+ Z_ADDREF_PP(zvalue);
+ *val = *zvalue;
+ zval_dtor(tmp);
+ Z_TYPE_P(tmp) = IS_NULL;
+ zval_ptr_dtor(&tmp);
+ }
+ }
+
+ return ZEND_HASH_APPLY_KEEP;
+}
+
+PHP_HTTP_API STATUS php_http_querystring_parse(HashTable *ht, const char *str, size_t len TSRMLS_DC)
+{
+ STATUS rv = FAILURE;
+ php_http_params_opts_t opts;
+ php_http_params_token_t psep = { ZEND_STRL("&") }, *psepp[] = { &psep, NULL };
+ php_http_params_token_t vsep = { ZEND_STRL("=") }, *vsepp[] = { &vsep, NULL };
+ const char *asi_str = NULL;
+ size_t asi_len = 0;
+
+ opts.input.str = estrndup(str, len);
+ opts.input.len = len;
+ opts.param = psepp;
+ opts.arg = NULL;
+ opts.val = vsepp;
+ opts.flags = PHP_HTTP_PARAMS_QUERY;
+
+ if (SUCCESS == php_http_ini_entry(ZEND_STRL("arg_separator.input"), &asi_str, &asi_len, 0 TSRMLS_CC) && asi_len) {
+ zval *arr;
+
+ MAKE_STD_ZVAL(arr);
+ array_init_size(arr, asi_len);
+
+ do {
+ add_next_index_stringl(arr, asi_str++, 1, 1);
+ } while (*asi_str);
+
+ opts.param = php_http_params_separator_init(arr TSRMLS_CC);
+
+ zval_ptr_dtor(&arr);
+ }
+
+ MAKE_STD_ZVAL(opts.defval);
+ ZVAL_NULL(opts.defval);
+
+ if (php_http_params_parse(ht, &opts TSRMLS_CC)) {
+ zend_hash_apply(ht, apply_querystring TSRMLS_CC);
+ rv = SUCCESS;
+ }
+
+ if (asi_len) {
+ php_http_params_separator_free(opts.param);
+ }
+
+ zval_ptr_dtor(&opts.defval);
+ efree(opts.input.str);
+ return rv;
+}
+
PHP_HTTP_API STATUS php_http_querystring_update(zval *qarray, zval *params, zval *outstring TSRMLS_DC)
{
/* enforce proper type */
} else {
zv_ptr = php_http_ztyp(IS_STRING, params);
array_init(&zv);
- php_default_treat_data(PARSE_STRING, estrdup(Z_STRVAL_P(zv_ptr)), &zv TSRMLS_CC);
+ php_http_querystring_parse(Z_ARRVAL(zv), Z_STRVAL_P(zv_ptr), Z_STRLEN_P(zv_ptr) TSRMLS_CC);
zval_ptr_dtor(&zv_ptr);
zv_ptr = NULL;
ptr = Z_ARRVAL(zv);
return SUCCESS;
}
-#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpQueryString, method, 0, req_args)
-#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpQueryString, method, 0)
-#define PHP_HTTP_QUERYSTRING_ME(method, visibility) PHP_ME(HttpQueryString, method, PHP_HTTP_ARGS(HttpQueryString, method), visibility)
-#define PHP_HTTP_QUERYSTRING_GME(method, visibility) PHP_ME(HttpQueryString, method, PHP_HTTP_ARGS(HttpQueryString, __getter), visibility)
-
-PHP_HTTP_BEGIN_ARGS(__construct, 0)
- PHP_HTTP_ARG_VAL(params, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(getGlobalInstance);
-
-PHP_HTTP_EMPTY_ARGS(toArray);
-PHP_HTTP_EMPTY_ARGS(toString);
-
-PHP_HTTP_BEGIN_ARGS(get, 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(set, 1)
- PHP_HTTP_ARG_VAL(params, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(mod, 0)
- PHP_HTTP_ARG_VAL(params, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(__getter, 1)
- PHP_HTTP_ARG_VAL(name, 0)
- PHP_HTTP_ARG_VAL(defval, 0)
- PHP_HTTP_ARG_VAL(delete, 0)
-PHP_HTTP_END_ARGS;
-
-#ifdef PHP_HTTP_HAVE_ICONV
-PHP_HTTP_BEGIN_ARGS(xlate, 2)
- PHP_HTTP_ARG_VAL(from_encoding, 0)
- PHP_HTTP_ARG_VAL(to_encoding, 0)
-PHP_HTTP_END_ARGS;
-#endif
-
-PHP_HTTP_EMPTY_ARGS(serialize);
-PHP_HTTP_BEGIN_ARGS(unserialize, 1)
- PHP_HTTP_ARG_VAL(serialized, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(offsetGet, 1)
- PHP_HTTP_ARG_VAL(offset, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(offsetSet, 2)
- PHP_HTTP_ARG_VAL(offset, 0)
- PHP_HTTP_ARG_VAL(value, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(offsetExists, 1)
- PHP_HTTP_ARG_VAL(offset, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(offsetUnset, 1)
- PHP_HTTP_ARG_VAL(offset, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(getIterator);
-
-zend_class_entry *php_http_querystring_class_entry;
-zend_function_entry php_http_querystring_method_entry[] = {
- PHP_HTTP_QUERYSTRING_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR|ZEND_ACC_FINAL)
-
- PHP_HTTP_QUERYSTRING_ME(toArray, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_ME(toString, ZEND_ACC_PUBLIC)
- ZEND_MALIAS(HttpQueryString, __toString, toString, PHP_HTTP_ARGS(HttpQueryString, toString), ZEND_ACC_PUBLIC)
-
- PHP_HTTP_QUERYSTRING_ME(get, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_ME(set, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_ME(mod, ZEND_ACC_PUBLIC)
-
- PHP_HTTP_QUERYSTRING_GME(getBool, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_GME(getInt, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_GME(getFloat, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_GME(getString, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_GME(getArray, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_GME(getObject, ZEND_ACC_PUBLIC)
-
- PHP_HTTP_QUERYSTRING_ME(getIterator, ZEND_ACC_PUBLIC)
-
- PHP_HTTP_QUERYSTRING_ME(getGlobalInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#ifdef PHP_HTTP_HAVE_ICONV
- PHP_HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC)
-#endif
-
- /* Implements Serializable */
- PHP_HTTP_QUERYSTRING_ME(serialize, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_ME(unserialize, ZEND_ACC_PUBLIC)
-
- /* Implements ArrayAccess */
- PHP_HTTP_QUERYSTRING_ME(offsetGet, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_ME(offsetSet, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_ME(offsetExists, ZEND_ACC_PUBLIC)
- PHP_HTTP_QUERYSTRING_ME(offsetUnset, ZEND_ACC_PUBLIC)
-
- EMPTY_FUNCTION_ENTRY
-};
-
-PHP_MINIT_FUNCTION(http_querystring)
-{
- PHP_HTTP_REGISTER_CLASS(http, QueryString, http_querystring, php_http_object_class_entry, 0);
-
- zend_class_implements(php_http_querystring_class_entry TSRMLS_CC, 3, zend_ce_serializable, zend_ce_arrayaccess, zend_ce_aggregate);
-
- zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("instance"), (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC);
- zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("queryArray"), ZEND_ACC_PRIVATE TSRMLS_CC);
-
- zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_BOOL"), PHP_HTTP_QUERYSTRING_TYPE_BOOL TSRMLS_CC);
- zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_INT"), PHP_HTTP_QUERYSTRING_TYPE_INT TSRMLS_CC);
- zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_FLOAT"), PHP_HTTP_QUERYSTRING_TYPE_FLOAT TSRMLS_CC);
- zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_STRING"), PHP_HTTP_QUERYSTRING_TYPE_STRING TSRMLS_CC);
- zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_ARRAY"), PHP_HTTP_QUERYSTRING_TYPE_ARRAY TSRMLS_CC);
- zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_OBJECT"), PHP_HTTP_QUERYSTRING_TYPE_OBJECT TSRMLS_CC);
-
- return SUCCESS;
-}
-
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString___construct, 0, 0, 0)
+ ZEND_ARG_INFO(0, params)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, __construct)
{
zval *params = NULL;
} end_error_handling();
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_getGlobalInstance, 0, 0, 0)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, getGlobalInstance)
{
with_error_handling(EH_THROW, php_http_exception_class_entry) {
if (SUCCESS == zend_parse_parameters_none()) {
with_error_handling(EH_THROW, php_http_exception_class_entry) {
- zval *instance = *zend_std_get_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), 0, NULL TSRMLS_CC);
+ zval *instance = *zend_std_get_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), 0 PHP_HTTP_ZEND_LITERAL_CCN TSRMLS_CC);
if (Z_TYPE_P(instance) != IS_OBJECT) {
zval **_GET = NULL;
} end_error_handling();
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_getIterator, 0, 0, 0)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, getIterator)
{
with_error_handling(EH_THROW, php_http_exception_class_entry) {
} end_error_handling();
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_toString, 0, 0, 0)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, toString)
{
if (SUCCESS != zend_parse_parameters_none()) {
- RETURN_FALSE;
+ return;
}
php_http_querystring_str(getThis(), return_value TSRMLS_CC);
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_toArray, 0, 0, 0)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, toArray)
{
if (SUCCESS == zend_parse_parameters_none()) {
- RETURN_PROP(php_http_querystring_class_entry, "queryArray");
+ zval *zqa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC);
+ RETURN_ZVAL(zqa, 1, 0);
}
- RETURN_FALSE;
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_get, 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();
PHP_METHOD(HttpQueryString, get)
{
char *name_str = NULL;
}
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_set, 0, 0, 1)
+ ZEND_ARG_INFO(0, params)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, set)
{
zval *params;
RETVAL_ZVAL(getThis(), 1, 0);
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_mod, 0, 0, 0)
+ ZEND_ARG_INFO(0, params)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, mod)
{
zval *params;
} end_error_handling();
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString___getter, 0, 0, 1)
+ ZEND_ARG_INFO(0, name)
+ ZEND_ARG_INFO(0, defval)
+ ZEND_ARG_INFO(0, delete)
+ZEND_END_ARG_INFO();
#define PHP_HTTP_QUERYSTRING_GETTER(method, TYPE) \
PHP_METHOD(HttpQueryString, method) \
{ \
PHP_HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
#ifdef PHP_HTTP_HAVE_ICONV
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_xlate, 0, 0, 2)
+ ZEND_ARG_INFO(0, from_encoding)
+ ZEND_ARG_INFO(0, to_encoding)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, xlate)
{
with_error_handling(EH_THROW, php_http_exception_class_entry) {
}
#endif /* HAVE_ICONV */
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_serialize, 0, 0, 0)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, serialize)
{
if (SUCCESS != zend_parse_parameters_none()) {
- RETURN_FALSE;
+ return;
}
php_http_querystring_str(getThis(), return_value TSRMLS_CC);
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_unserialize, 0, 0, 1)
+ ZEND_ARG_INFO(0, serialized)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, unserialize)
{
zval *serialized;
} end_error_handling();
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_offsetGet, 0, 0, 1)
+ ZEND_ARG_INFO(0, offset)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, offsetGet)
{
char *offset_str;
}
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_offsetSet, 0, 0, 2)
+ ZEND_ARG_INFO(0, offset)
+ ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, offsetSet)
{
char *offset_str;
}
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_offsetExists, 0, 0, 1)
+ ZEND_ARG_INFO(0, offset)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, offsetExists)
{
char *offset_str;
}
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_offsetUnset, 0, 0, 1)
+ ZEND_ARG_INFO(0, offset)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, offsetUnset)
{
char *offset_str;
}
}
+zend_class_entry *php_http_querystring_class_entry;
+
+static zend_function_entry php_http_querystring_methods[] = {
+ PHP_ME(HttpQueryString, __construct, ai_HttpQueryString___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR|ZEND_ACC_FINAL)
+
+ PHP_ME(HttpQueryString, toArray, ai_HttpQueryString_toArray, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, toString, ai_HttpQueryString_toString, ZEND_ACC_PUBLIC)
+ ZEND_MALIAS(HttpQueryString, __toString, toString, ai_HttpQueryString_toString, ZEND_ACC_PUBLIC)
+
+ PHP_ME(HttpQueryString, get, ai_HttpQueryString_get, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, set, ai_HttpQueryString_set, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, mod, ai_HttpQueryString_mod, ZEND_ACC_PUBLIC)
+
+ PHP_ME(HttpQueryString, getBool, ai_HttpQueryString___getter, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, getInt, ai_HttpQueryString___getter, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, getFloat, ai_HttpQueryString___getter, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, getString, ai_HttpQueryString___getter, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, getArray, ai_HttpQueryString___getter, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, getObject, ai_HttpQueryString___getter, ZEND_ACC_PUBLIC)
+
+ PHP_ME(HttpQueryString, getIterator, ai_HttpQueryString_getIterator, ZEND_ACC_PUBLIC)
+
+ PHP_ME(HttpQueryString, getGlobalInstance, ai_HttpQueryString_getGlobalInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+#ifdef PHP_HTTP_HAVE_ICONV
+ PHP_ME(HttpQueryString, xlate, ai_HttpQueryString_xlate, ZEND_ACC_PUBLIC)
+#endif
+
+ /* Implements Serializable */
+ PHP_ME(HttpQueryString, serialize, ai_HttpQueryString_serialize, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, unserialize, ai_HttpQueryString_unserialize, ZEND_ACC_PUBLIC)
+
+ /* Implements ArrayAccess */
+ PHP_ME(HttpQueryString, offsetGet, ai_HttpQueryString_offsetGet, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, offsetSet, ai_HttpQueryString_offsetSet, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, offsetExists, ai_HttpQueryString_offsetExists, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpQueryString, offsetUnset, ai_HttpQueryString_offsetUnset, ZEND_ACC_PUBLIC)
+
+ EMPTY_FUNCTION_ENTRY
+};
+
+PHP_MINIT_FUNCTION(http_querystring)
+{
+ zend_class_entry ce = {0};
+
+ INIT_NS_CLASS_ENTRY(ce, "http", "QueryString", php_http_querystring_methods);
+ php_http_querystring_class_entry = zend_register_internal_class_ex(&ce, php_http_object_class_entry, NULL TSRMLS_CC);
+ zend_class_implements(php_http_querystring_class_entry TSRMLS_CC, 3, zend_ce_serializable, zend_ce_arrayaccess, zend_ce_aggregate);
+
+ zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("instance"), (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC);
+ zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("queryArray"), ZEND_ACC_PRIVATE TSRMLS_CC);
+
+ zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_BOOL"), PHP_HTTP_QUERYSTRING_TYPE_BOOL TSRMLS_CC);
+ zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_INT"), PHP_HTTP_QUERYSTRING_TYPE_INT TSRMLS_CC);
+ zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_FLOAT"), PHP_HTTP_QUERYSTRING_TYPE_FLOAT TSRMLS_CC);
+ zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_STRING"), PHP_HTTP_QUERYSTRING_TYPE_STRING TSRMLS_CC);
+ zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_ARRAY"), PHP_HTTP_QUERYSTRING_TYPE_ARRAY TSRMLS_CC);
+ zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_OBJECT"), PHP_HTTP_QUERYSTRING_TYPE_OBJECT TSRMLS_CC);
+
+ return SUCCESS;
+}
/*
* Local variables: