| 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> |
+--------------------------------------------------------------------+
*/
static php_http_params_token_t def_arg_sep = {";", 1}, *def_arg_sep_ptr[] = {&def_arg_sep, NULL};
static php_http_params_token_t def_val_sep = {"=", 1}, *def_val_sep_ptr[] = {&def_val_sep, NULL};
static php_http_params_opts_t def_opts = {
- .param = def_param_sep_ptr,
- .arg = def_arg_sep_ptr,
- .val = def_val_sep_ptr,
- .defval = NULL,
- .flags = PHP_HTTP_PARAMS_DEFAULT
+ {NULL, 0},
+ def_param_sep_ptr,
+ def_arg_sep_ptr,
+ def_val_sep_ptr,
+ NULL,
+ PHP_HTTP_PARAMS_DEFAULT
};
PHP_HTTP_API php_http_params_opts_t *php_http_params_opts_default_get(php_http_params_opts_t *opts)
zval **args;
zval **val;
} current;
+ unsigned quotes:1;
+ unsigned escape:1;
} php_http_params_state_t;
-static void sanitize_default(zval *zv TSRMLS_DC)
+static inline void sanitize_default(zval *zv TSRMLS_DC)
{
if (Z_STRVAL_P(zv)[0] == '"' && Z_STRVAL_P(zv)[Z_STRLEN_P(zv) - 1] == '"') {
size_t deq_len = Z_STRLEN_P(zv) - 2;
php_stripslashes(Z_STRVAL_P(zv), &Z_STRLEN_P(zv) TSRMLS_CC);
}
-static void prepare_default(zval *zv TSRMLS_DC)
+static inline void prepare_default(zval *zv TSRMLS_DC)
{
- int len = Z_STRLEN_P(zv);
+ if (Z_TYPE_P(zv) == IS_STRING) {
+ int len = Z_STRLEN_P(zv);
- Z_STRVAL_P(zv) = php_addslashes(Z_STRVAL_P(zv), Z_STRLEN_P(zv), &Z_STRLEN_P(zv), 1 TSRMLS_CC);
+ Z_STRVAL_P(zv) = php_addslashes(Z_STRVAL_P(zv), Z_STRLEN_P(zv), &Z_STRLEN_P(zv), 1 TSRMLS_CC);
- if (len != Z_STRLEN_P(zv)) {
- zval tmp = *zv;
- int len = Z_STRLEN_P(zv) + 2;
- char *str = emalloc(len + 1);
+ if (len != Z_STRLEN_P(zv)) {
+ zval tmp = *zv;
+ int len = Z_STRLEN_P(zv) + 2;
+ char *str = emalloc(len + 1);
- str[0] = '"';
- memcpy(&str[1], Z_STRVAL_P(zv), Z_STRLEN_P(zv));
- str[len-1] = '"';
- str[len] = '\0';
+ str[0] = '"';
+ memcpy(&str[1], Z_STRVAL_P(zv), Z_STRLEN_P(zv));
+ str[len-1] = '"';
+ str[len] = '\0';
- zval_dtor(&tmp);
- ZVAL_STRINGL(zv, str, len, 0);
+ zval_dtor(&tmp);
+ ZVAL_STRINGL(zv, str, len, 0);
+ }
+ } else {
+ zval_dtor(zv);
+ ZVAL_EMPTY_STRING(zv);
}
}
-static void sanitize_urlencoded(zval *zv TSRMLS_DC)
+static inline void sanitize_urlencoded(zval *zv TSRMLS_DC)
{
Z_STRLEN_P(zv) = php_raw_url_decode(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
}
-static void prepare_urlencoded(zval *zv TSRMLS_DC)
+static inline void prepare_urlencoded(zval *zv TSRMLS_DC)
{
int len;
- char *str = php_raw_url_encode(Z_STRVAL_P(zv), Z_STRLEN_P(zv), &len);
+ char *str = php_url_encode(Z_STRVAL_P(zv), Z_STRLEN_P(zv), &len);
zval_dtor(zv);
ZVAL_STRINGL(zv, str, len, 0);
if (zend_hash_num_elements(Z_ARRVAL_P(arr))) {
zval_dtor(zv);
+#if PHP_VERSION_ID >= 50400
ZVAL_COPY_VALUE(zv, arr);
+#else
+ zv->value = arr->value;
+ Z_TYPE_P(zv) = Z_TYPE_P(arr);
+#endif
FREE_ZVAL(arr);
} else {
zval_ptr_dtor(&arr);
}
}
-static void prepare_dimension(zval *zv TSRMLS_DC)
+static inline void shift_key(php_http_buffer_t *buf, char *key_str, size_t key_len, const char *ass, size_t asl, unsigned flags TSRMLS_DC);
+static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags TSRMLS_DC);
+
+static void prepare_dimension(php_http_buffer_t *buf, php_http_buffer_t *keybuf, zval *zvalue, const char *pss, size_t psl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
{
- if (Z_TYPE_P(zv) == IS_ARRAY) {
- zval **zdata = &zv;
- php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
- php_http_buffer_t buf;
+ HashTable *ht = HASH_OF(zvalue);
+ HashPosition pos;
+ php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+ zval **val;
+ php_http_buffer_t prefix;
- php_http_buffer_init(&buf);
+ if (!ht->nApplyCount++) {
+ php_http_buffer_init(&prefix);
+ php_http_buffer_append(&prefix, keybuf->data, keybuf->used);
- do {
- if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_PP(zdata), &key.str, &key.len, &key.num, key.dup, NULL)) {
- php_http_buffer_appendf(&buf, "[%s]", key.str);
+ FOREACH_HASH_KEYVAL(pos, ht, key, val) {
+ if (key.type == HASH_KEY_IS_STRING && !*key.str) {
+ /* only public properties */
+ continue;
+ }
+
+ php_http_buffer_appends(&prefix, "[");
+ if (key.type == HASH_KEY_IS_STRING) {
+ php_http_buffer_append(&prefix, key.str, key.len - 1);
} else {
- php_http_buffer_appendf(&buf, "[%lu]", key.num);
+ php_http_buffer_appendf(&prefix, "%lu", key.num);
}
- } while (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(zdata), (void *) &zdata) && Z_TYPE_PP(zdata) == IS_ARRAY);
+ php_http_buffer_appends(&prefix, "]");
- php_http_buffer_fix(&buf);
- zval_dtor(zv);
- ZVAL_STRINGL(zv, buf.data, buf.used, 0);
+ if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) {
+ prepare_dimension(buf, &prefix, *val, pss, psl, vss, vsl, flags TSRMLS_CC);
+ } else {
+ zval *cpy = php_http_ztyp(IS_STRING, *val);
+
+ shift_key(buf, prefix.data, prefix.used, pss, psl, flags TSRMLS_CC);
+ shift_val(buf, cpy, vss, vsl, flags TSRMLS_CC);
+ zval_ptr_dtor(&cpy);
+ }
+
+ php_http_buffer_cut(&prefix, keybuf->used, prefix.used - keybuf->used);
+ }
+ php_http_buffer_dtor(&prefix);
}
+ --ht->nApplyCount;
}
-static void sanitize_key(unsigned flags, char *str, size_t len, zval *zv TSRMLS_DC)
+static inline void sanitize_key(unsigned flags, char *str, size_t len, zval *zv TSRMLS_DC)
{
+ zval_dtor(zv);
php_trim(str, len, NULL, 0, zv, 3 TSRMLS_CC);
if (flags & PHP_HTTP_PARAMS_DEFAULT) {
}
}
-static void sanitize_value(unsigned flags, char *str, size_t len, zval *zv TSRMLS_DC)
+static inline void sanitize_value(unsigned flags, char *str, size_t len, zval *zv TSRMLS_DC)
{
+ zval_dtor(zv);
php_trim(str, len, NULL, 0, zv, 3 TSRMLS_CC);
if (flags & PHP_HTTP_PARAMS_DEFAULT) {
}
}
-static void prepare_key(unsigned flags, char *old_key, size_t old_len, char **new_key, size_t *new_len TSRMLS_DC)
+static inline void prepare_key(unsigned flags, char *old_key, size_t old_len, char **new_key, size_t *new_len TSRMLS_DC)
{
zval zv;
INIT_PZVAL(&zv);
ZVAL_STRINGL(&zv, old_key, old_len, 1);
- if (flags & PHP_HTTP_PARAMS_DIMENSION) {
- prepare_dimension(&zv TSRMLS_CC);
- }
-
if (flags & PHP_HTTP_PARAMS_URLENCODED) {
prepare_urlencoded(&zv TSRMLS_CC);
}
*new_len = Z_STRLEN(zv);
}
-static void prepare_value(unsigned flags, zval *zv TSRMLS_DC)
+static inline void prepare_value(unsigned flags, zval *zv TSRMLS_DC)
{
- if (flags & PHP_HTTP_PARAMS_DIMENSION) {
- prepare_dimension(zv TSRMLS_CC);
- }
-
if (flags & PHP_HTTP_PARAMS_URLENCODED) {
prepare_urlencoded(zv TSRMLS_CC);
}
break;
}
} else {
- if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(ptr), hkey.str, hkey.len, (void *) &ptr)) {
+ if (SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(ptr), hkey.num, (void *) &ptr)) {
zdata_ptr = test_ptr;
} else if (hkey.num) {
Z_ADDREF_PP(test_ptr);
zval *val, key;
INIT_PZVAL(&key);
+ ZVAL_NULL(&key);
sanitize_key(opts->flags, state->arg.str, state->arg.len, &key TSRMLS_CC);
- if (Z_STRLEN(key)) {
+ if (Z_TYPE(key) == IS_STRING && Z_STRLEN(key)) {
MAKE_STD_ZVAL(val);
ZVAL_TRUE(val);
zend_symtable_update(Z_ARRVAL_PP(state->current.args), Z_STRVAL(key), Z_STRLEN(key) + 1, (void *) &val, sizeof(zval *), (void *) &state->current.val);
{
php_http_params_token_t **sep = separators;
+ if (state->quotes || state->escape) {
+ return 0;
+ }
+
if (sep) while (*sep) {
if (check_str(state->input.str, state->input.len, (*sep)->str, (*sep)->len)) {
return (*sep)->len;
PHP_HTTP_API HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t *opts TSRMLS_DC)
{
- php_http_params_state_t state = {{NULL,0}, {NULL,0}, {NULL,0}, {NULL,0}, {NULL,NULL,NULL}};
+ php_http_params_state_t state = {{NULL,0}, {NULL,0}, {NULL,0}, {NULL,0}, {NULL,NULL,NULL}, 0, 0};
state.input.str = opts->input.str;
state.input.len = opts->input.len;
}
while (state.input.len) {
- if (*state.input.str == '\\') {
- ++state.input.str;
- --state.input.len;
- } else if (!state.param.str) {
+ if (*state.input.str == '"' && !state.escape) {
+ state.quotes = !state.quotes;
+ } else {
+ state.escape = (*state.input.str == '\\');
+ }
+
+ if (!state.param.str) {
/* initialize */
skip_sep(0, &state, opts->param, opts->arg, opts->val TSRMLS_CC);
state.param.str = state.input.str;
}
}
}
-
+
if (state.input.len) {
++state.input.str;
--state.input.len;
return params;
}
-static void shift_param(php_http_buffer_t *buf, char *key_str, size_t key_len, zval **zvalue, const char *css, size_t csl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
+static inline void shift_key(php_http_buffer_t *buf, char *key_str, size_t key_len, const char *ass, size_t asl, unsigned flags TSRMLS_DC)
{
- if (Z_TYPE_PP(zvalue) == IS_ARRAY) {
- zval *tmp = php_http_zsep(1, IS_ARRAY, *zvalue);
-
- do {
- char *str;
- size_t len;
- zval *tmp2;
-
- if (PHP_HTTP_BUFFER_LEN(buf)) {
- php_http_buffer_append(buf, css, csl);
- }
-
- prepare_key(flags, key_str, key_len, &str, &len TSRMLS_CC);
- php_http_buffer_append(buf, str, len);
- efree(str);
-
- tmp2 = php_http_zsep(1, IS_ARRAY, tmp);
- prepare_value(flags, tmp2 TSRMLS_CC);
- php_http_buffer_append(buf, Z_STRVAL_P(tmp2), Z_STRLEN_P(tmp2));
- zval_ptr_dtor(&tmp2);
+ char *str;
+ size_t len;
- zvalue = &tmp;
- while (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(zvalue), (void *) &zvalue) && Z_TYPE_PP(zvalue) == IS_ARRAY);
+ if (buf->used) {
+ php_http_buffer_append(buf, ass, asl);
+ }
- if (Z_TYPE_PP(zvalue) != IS_BOOL) {
- php_http_buffer_append(buf, vss, vsl);
+ prepare_key(flags, key_str, key_len, &str, &len TSRMLS_CC);
+ php_http_buffer_append(buf, str, len);
+ efree(str);
+}
- tmp2 = php_http_ztyp(IS_STRING, *zvalue);
- prepare_value(flags, tmp2 TSRMLS_CC);
- php_http_buffer_append(buf, Z_STRVAL_P(tmp2), Z_STRLEN_P(tmp2));
- zval_ptr_dtor(&tmp2);
- } else if (!Z_BVAL_PP(zvalue)) {
- php_http_buffer_append(buf, vss, vsl);
- php_http_buffer_appends(buf, "0");
- }
+static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
+{
+ if (Z_TYPE_P(zvalue) != IS_BOOL) {
+ zval *tmp = php_http_zsep(1, IS_STRING, zvalue);
- } while (SUCCESS == zend_hash_move_forward(Z_ARRVAL_P(tmp)) && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(tmp), (void *) &zvalue));
+ prepare_value(flags, tmp TSRMLS_CC);
+ php_http_buffer_append(buf, vss, vsl);
+ php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
zval_ptr_dtor(&tmp);
+ } else if (!Z_BVAL_P(zvalue)) {
+ php_http_buffer_append(buf, vss, vsl);
+ php_http_buffer_appends(buf, "0");
+ }
+}
- } else {
- zval *tmp;
- char *str;
- size_t len;
+static void shift_arg(php_http_buffer_t *buf, char *key_str, size_t key_len, zval *zvalue, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
+{
+ if (Z_TYPE_P(zvalue) == IS_ARRAY || Z_TYPE_P(zvalue) == IS_OBJECT) {
+ HashPosition pos;
+ php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+ zval **val;
- if (PHP_HTTP_BUFFER_LEN(buf)) {
- php_http_buffer_append(buf, css, csl);
+ shift_key(buf, key_str, key_len, ass, asl, flags TSRMLS_CC);
+ FOREACH_KEYVAL(pos, zvalue, key, val) {
+ /* did you mean recursion? */
+ php_http_array_hashkey_stringify(&key);
+ shift_arg(buf, key.str, key.len-1, *val, ass, asl, vss, vsl, flags TSRMLS_CC);
+ php_http_array_hashkey_stringfree(&key);
}
+ } else {
+ shift_key(buf, key_str, key_len, ass, asl, flags TSRMLS_CC);
+ shift_val(buf, zvalue, vss, vsl, flags TSRMLS_CC);
+ }
+}
- prepare_key(flags, key_str, key_len, &str, &len TSRMLS_CC);
- php_http_buffer_append(buf, str, len);
- efree(str);
-
- if (Z_TYPE_PP(zvalue) != IS_BOOL) {
- tmp = php_http_ztyp(IS_STRING, *zvalue);
- prepare_value(flags, tmp TSRMLS_CC);
- php_http_buffer_append(buf, vss, vsl);
- php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
- zval_ptr_dtor(&tmp);
- } else if (!Z_BVAL_PP(zvalue)) {
- php_http_buffer_append(buf, vss, vsl);
- php_http_buffer_appends(buf, "0");
+static void shift_param(php_http_buffer_t *buf, char *key_str, size_t key_len, zval *zvalue, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
+{
+ if (Z_TYPE_P(zvalue) == IS_ARRAY || Z_TYPE_P(zvalue) == IS_OBJECT) {
+ /* treat as arguments, unless we care for dimensions */
+ if (flags & PHP_HTTP_PARAMS_DIMENSION) {
+ php_http_buffer_t *keybuf = php_http_buffer_from_string(key_str, key_len);
+ prepare_dimension(buf, keybuf, zvalue, pss, psl, vss, vsl, flags TSRMLS_CC);
+ php_http_buffer_free(&keybuf);
+ } else {
+ shift_arg(buf, key_str, key_len, zvalue, ass, asl, vss, vsl, flags TSRMLS_CC);
}
+ } else {
+ shift_key(buf, key_str, key_len, pss, psl, flags TSRMLS_CC);
+ shift_val(buf, zvalue, vss, vsl, flags TSRMLS_CC);
}
}
}
php_http_array_hashkey_stringify(&key);
- shift_param(buf, key.str, key.len - 1, zvalue, pss, psl, vss, vsl, flags TSRMLS_CC);
+ shift_param(buf, key.str, key.len - 1, *zvalue, pss, psl, ass, asl, vss, vsl, flags TSRMLS_CC);
php_http_array_hashkey_stringfree(&key);
if (Z_TYPE_PP(zparam) == IS_ARRAY && SUCCESS != zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("arguments"), (void *) &zvalue)) {
}
php_http_array_hashkey_stringify(&key1);
- shift_param(buf, key1.str, key1.len - 1, zargs, ass, asl, vss, vsl, flags TSRMLS_CC);
+ shift_arg(buf, key1.str, key1.len - 1, *zargs, ass, asl, vss, vsl, flags TSRMLS_CC);
php_http_array_hashkey_stringfree(&key1);
}
}
return buf;
}
-#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpParams, method, 0, req_args)
-#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpParams, method, 0)
-#define PHP_HTTP_PARAMS_ME(method, visibility) PHP_ME(HttpParams, method, PHP_HTTP_ARGS(HttpParams, method), visibility)
-#define PHP_HTTP_PARAMS_GME(method, visibility) PHP_ME(HttpParams, method, PHP_HTTP_ARGS(HttpParams, __getter), visibility)
-
-PHP_HTTP_BEGIN_ARGS(__construct, 0)
- PHP_HTTP_ARG_VAL(params, 0)
- PHP_HTTP_ARG_VAL(param_sep, 0)
- PHP_HTTP_ARG_VAL(arg_sep, 0)
- PHP_HTTP_ARG_VAL(val_sep, 0)
- PHP_HTTP_ARG_VAL(flags, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(toArray);
-PHP_HTTP_EMPTY_ARGS(toString);
-
-PHP_HTTP_BEGIN_ARGS(offsetExists, 1)
- PHP_HTTP_ARG_VAL(name, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(offsetUnset, 1)
- PHP_HTTP_ARG_VAL(name, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(offsetGet, 1)
- PHP_HTTP_ARG_VAL(name, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(offsetSet, 2)
- PHP_HTTP_ARG_VAL(name, 0)
- PHP_HTTP_ARG_VAL(value, 0)
-PHP_HTTP_END_ARGS;
-
-static zend_class_entry *php_http_params_class_entry;
-
-zend_class_entry *php_http_params_get_class_entry(void)
-{
- return php_http_params_class_entry;
-}
-
-static zend_function_entry php_http_params_method_entry[] = {
- PHP_HTTP_PARAMS_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR|ZEND_ACC_FINAL)
-
- PHP_HTTP_PARAMS_ME(toArray, ZEND_ACC_PUBLIC)
- PHP_HTTP_PARAMS_ME(toString, ZEND_ACC_PUBLIC)
- ZEND_MALIAS(HttpParams, __toString, toString, PHP_HTTP_ARGS(HttpParams, toString), ZEND_ACC_PUBLIC)
-
- PHP_HTTP_PARAMS_ME(offsetExists, ZEND_ACC_PUBLIC)
- PHP_HTTP_PARAMS_ME(offsetUnset, ZEND_ACC_PUBLIC)
- PHP_HTTP_PARAMS_ME(offsetSet, ZEND_ACC_PUBLIC)
- PHP_HTTP_PARAMS_ME(offsetGet, ZEND_ACC_PUBLIC)
-
- EMPTY_FUNCTION_ENTRY
-};
-
-PHP_MINIT_FUNCTION(http_params)
-{
- PHP_HTTP_REGISTER_CLASS(http, Params, http_params, php_http_object_get_class_entry(), 0);
-
- zend_class_implements(php_http_params_class_entry TSRMLS_CC, 1, zend_ce_arrayaccess);
-
- zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_PARAM_SEP"), ZEND_STRL(",") TSRMLS_CC);
- zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_ARG_SEP"), ZEND_STRL(";") TSRMLS_CC);
- zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_VAL_SEP"), ZEND_STRL("=") TSRMLS_CC);
- zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("COOKIE_PARAM_SEP"), ZEND_STRL("") TSRMLS_CC);
-
- zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_PARAMS_RAW TSRMLS_CC);
- zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_DEFAULT"), PHP_HTTP_PARAMS_DEFAULT TSRMLS_CC);
- zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_URLENCODED"), PHP_HTTP_PARAMS_URLENCODED TSRMLS_CC);
- zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_DIMENSION"), PHP_HTTP_PARAMS_DIMENSION TSRMLS_CC);
- zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_QUERY"), PHP_HTTP_PARAMS_QUERY TSRMLS_CC);
-
- zend_declare_property_null(php_http_params_class_entry, ZEND_STRL("params"), ZEND_ACC_PUBLIC TSRMLS_CC);
- zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("param_sep"), ZEND_STRL(","), ZEND_ACC_PUBLIC TSRMLS_CC);
- zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("arg_sep"), ZEND_STRL(";"), ZEND_ACC_PUBLIC TSRMLS_CC);
- zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("val_sep"), ZEND_STRL("="), ZEND_ACC_PUBLIC TSRMLS_CC);
- zend_declare_property_long(php_http_params_class_entry, ZEND_STRL("flags"), PHP_HTTP_PARAMS_DEFAULT, ZEND_ACC_PUBLIC TSRMLS_CC);
-
- return SUCCESS;
-}
-
PHP_HTTP_API php_http_params_token_t **php_http_params_separator_init(zval *zv TSRMLS_DC)
{
zval **sep;
}
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams___construct, 0, 0, 0)
+ ZEND_ARG_INFO(0, params)
+ ZEND_ARG_INFO(0, param_sep)
+ ZEND_ARG_INFO(0, arg_sep)
+ ZEND_ARG_INFO(0, val_sep)
+ ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpParams, __construct)
{
- with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
+ with_error_handling(EH_THROW, php_http_exception_class_entry) {
zval *zcopy, *zparams = NULL, *param_sep = NULL, *arg_sep = NULL, *val_sep = NULL;
long flags = PHP_HTTP_PARAMS_DEFAULT;
zcopy = php_http_ztyp(IS_STRING, zparams);
if (Z_STRLEN_P(zcopy)) {
php_http_params_opts_t opts = {
- .input = {
- .str = Z_STRVAL_P(zcopy),
- .len = Z_STRLEN_P(zcopy)
- },
- .param = php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0 TSRMLS_CC) TSRMLS_CC),
- .arg = php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0 TSRMLS_CC) TSRMLS_CC),
- .val = php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0 TSRMLS_CC) TSRMLS_CC),
- .flags = flags
+ {Z_STRVAL_P(zcopy), Z_STRLEN_P(zcopy)},
+ php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0 TSRMLS_CC) TSRMLS_CC),
+ php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0 TSRMLS_CC) TSRMLS_CC),
+ php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0 TSRMLS_CC) TSRMLS_CC),
+ NULL, flags
};
MAKE_STD_ZVAL(zparams);
} end_error_handling();
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_toArray, 0, 0, 0)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpParams, toArray)
{
- if (SUCCESS != zend_parse_parameters_none()) {
- RETURN_FALSE;
+ if (SUCCESS == zend_parse_parameters_none()) {
+ zval *zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC);
+ RETURN_ZVAL(zparams, 1, 0);
}
- RETURN_PROP(php_http_params_class_entry, "params");
+ RETURN_FALSE;
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_toString, 0, 0, 0)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpParams, toString)
{
zval **tmp, *zparams, *zpsep, *zasep, *zvsep, *zflags;
php_http_buffer_t buf;
- zparams = php_http_ztyp(IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC));
+ zparams = php_http_zsep(1, IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC));
zflags = php_http_ztyp(IS_LONG, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("flags"), 0 TSRMLS_CC));
- zpsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0 TSRMLS_CC);
- zasep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0 TSRMLS_CC);
- zvsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0 TSRMLS_CC);
zpsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0 TSRMLS_CC);
if (Z_TYPE_P(zpsep) == IS_ARRAY && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zpsep), (void *) &tmp)) {
RETVAL_PHP_HTTP_BUFFER_VAL(&buf);
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetExists, 0, 0, 1)
+ ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpParams, offsetExists)
{
char *name_str;
}
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetGet, 0, 0, 1)
+ ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpParams, offsetGet)
{
char *name_str;
}
}
-
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetUnset, 0, 0, 1)
+ ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpParams, offsetUnset)
{
char *name_str;
}
}
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetSet, 0, 0, 2)
+ ZEND_ARG_INFO(0, name)
+ ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
PHP_METHOD(HttpParams, offsetSet)
{
zval *nvalue;
}
}
+static zend_function_entry php_http_params_methods[] = {
+ PHP_ME(HttpParams, __construct, ai_HttpParams___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR|ZEND_ACC_FINAL)
+
+ PHP_ME(HttpParams, toArray, ai_HttpParams_toArray, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpParams, toString, ai_HttpParams_toString, ZEND_ACC_PUBLIC)
+ ZEND_MALIAS(HttpParams, __toString, toString, ai_HttpParams_toString, ZEND_ACC_PUBLIC)
+
+ PHP_ME(HttpParams, offsetExists, ai_HttpParams_offsetExists, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpParams, offsetUnset, ai_HttpParams_offsetUnset, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpParams, offsetSet, ai_HttpParams_offsetSet, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpParams, offsetGet, ai_HttpParams_offsetGet, ZEND_ACC_PUBLIC)
+
+ EMPTY_FUNCTION_ENTRY
+};
+
+zend_class_entry *php_http_params_class_entry;
+
+PHP_MINIT_FUNCTION(http_params)
+{
+ zend_class_entry ce = {0};
+
+ INIT_NS_CLASS_ENTRY(ce, "http", "Params", php_http_params_methods);
+ php_http_params_class_entry = zend_register_internal_class_ex(&ce, php_http_object_class_entry, NULL TSRMLS_CC);
+ zend_class_implements(php_http_params_class_entry TSRMLS_CC, 1, zend_ce_arrayaccess);
+
+ zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_PARAM_SEP"), ZEND_STRL(",") TSRMLS_CC);
+ zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_ARG_SEP"), ZEND_STRL(";") TSRMLS_CC);
+ zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_VAL_SEP"), ZEND_STRL("=") TSRMLS_CC);
+ zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("COOKIE_PARAM_SEP"), ZEND_STRL("") TSRMLS_CC);
+
+ zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_PARAMS_RAW TSRMLS_CC);
+ zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_DEFAULT"), PHP_HTTP_PARAMS_DEFAULT TSRMLS_CC);
+ zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_URLENCODED"), PHP_HTTP_PARAMS_URLENCODED TSRMLS_CC);
+ zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_DIMENSION"), PHP_HTTP_PARAMS_DIMENSION TSRMLS_CC);
+ zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_QUERY"), PHP_HTTP_PARAMS_QUERY TSRMLS_CC);
+
+ zend_declare_property_null(php_http_params_class_entry, ZEND_STRL("params"), ZEND_ACC_PUBLIC TSRMLS_CC);
+ zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("param_sep"), ZEND_STRL(","), ZEND_ACC_PUBLIC TSRMLS_CC);
+ zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("arg_sep"), ZEND_STRL(";"), ZEND_ACC_PUBLIC TSRMLS_CC);
+ zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("val_sep"), ZEND_STRL("="), ZEND_ACC_PUBLIC TSRMLS_CC);
+ zend_declare_property_long(php_http_params_class_entry, ZEND_STRL("flags"), PHP_HTTP_PARAMS_DEFAULT, ZEND_ACC_PUBLIC TSRMLS_CC);
+
+ return SUCCESS;
+}
+
/*
* Local variables:
* tab-width: 4
projects / m6w6 / ext-http / blobdiff