X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_params.c;h=2356dc96170bb525f342d1085d4ef03362bb749a;hp=3d6e8025820486cdfc75b7bd307c09254819a7bb;hb=92a430bc613226e2fb1badd624933eeb6c8cb3ce;hpb=565b1721506d335bd2fc8b52126b3827eb7212e4 diff --git a/php_http_params.c b/php_http_params.c index 3d6e802..2356dc9 100644 --- a/php_http_params.c +++ b/php_http_params.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2011, Michael Wallner | + | Copyright (c) 2004-2013, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -45,6 +45,8 @@ typedef struct php_http_params_state { zval **args; zval **val; } current; + unsigned quotes:1; + unsigned escape:1; } php_http_params_state_t; static inline void sanitize_default(zval *zv TSRMLS_DC) @@ -421,12 +423,7 @@ static void push_param(HashTable *params, php_http_params_state_t *state, const MAKE_STD_ZVAL(val); if (opts->defval) { -#if PHP_VERSION_ID >= 50400 ZVAL_COPY_VALUE(val, opts->defval); -#else - val->value = opts->defval->value; - Z_TYPE_P(val) = Z_TYPE_P(opts->defval); -#endif zval_copy_ctor(val); } else { ZVAL_TRUE(val); @@ -452,6 +449,10 @@ static size_t check_sep(php_http_params_state_t *state, php_http_params_token_t { 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; @@ -479,7 +480,7 @@ static void skip_sep(size_t skip, php_http_params_state_t *state, php_http_param 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; @@ -490,10 +491,13 @@ PHP_HTTP_API HashTable *php_http_params_parse(HashTable *params, const php_http_ } 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; @@ -546,7 +550,7 @@ PHP_HTTP_API HashTable *php_http_params_parse(HashTable *params, const php_http_ } } } - + if (state.input.len) { ++state.input.str; --state.input.len; @@ -575,13 +579,7 @@ static inline void shift_key(php_http_buffer_t *buf, char *key_str, size_t key_l 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; - - if (Z_TYPE_P(zvalue) == IS_ARRAY) { - tmp = php_http_zsep(1, IS_ARRAY, zvalue); - } else { - tmp = php_http_zsep(1, IS_STRING, zvalue); - } + zval *tmp = php_http_zsep(1, IS_STRING, zvalue); prepare_value(flags, tmp TSRMLS_CC); php_http_buffer_append(buf, vss, vsl); @@ -601,6 +599,7 @@ static void shift_arg(php_http_buffer_t *buf, char *key_str, size_t key_len, zva php_http_array_hashkey_t key = php_http_array_hashkey_init(0); zval **val; + 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); @@ -677,87 +676,6 @@ PHP_HTTP_API php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf 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; @@ -801,9 +719,16 @@ PHP_HTTP_API void php_http_params_separator_free(php_http_params_token_t **separ } } +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; @@ -865,14 +790,19 @@ PHP_METHOD(HttpParams, __construct) } 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; @@ -912,6 +842,9 @@ PHP_METHOD(HttpParams, toString) 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; @@ -929,6 +862,9 @@ PHP_METHOD(HttpParams, offsetExists) } } +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; @@ -945,7 +881,9 @@ PHP_METHOD(HttpParams, offsetGet) } } - +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; @@ -961,6 +899,10 @@ PHP_METHOD(HttpParams, offsetUnset) } } +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; @@ -1011,6 +953,51 @@ PHP_METHOD(HttpParams, offsetSet) } } +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