X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_querystring.c;h=5f4eff81a9a101414d4ffed647fcc9ae6c9a4f12;hp=8c65a7a928a355fa07da96d03b174886a5a68434;hb=1f37d09e4c7f55cf6f2c3c10ea3ec2424a482671;hpb=bd80b17b026a00a254ee8693cd7bacf1ebdec4cf diff --git a/php_http_querystring.c b/php_http_querystring.c index 8c65a7a..5f4eff8 100644 --- a/php_http_querystring.c +++ b/php_http_querystring.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-2014, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -16,59 +16,69 @@ #include #ifdef PHP_HTTP_HAVE_ICONV +# ifndef HAVE_ICONV +# define HAVE_ICONV 1 +# endif # undef PHP_ATOM_INC # include #endif - #define QS_MERGE 1 -static inline void php_http_querystring_set(zval *instance, zval *params, int flags TSRMLS_DC) +static inline void php_http_querystring_set(zval *instance, zval *params, int flags) { - zval *qa; + zval qa; + + array_init(&qa); if (flags & QS_MERGE) { - qa = php_http_zsep(1, IS_ARRAY, zend_read_property(php_http_querystring_get_class_entry(), instance, ZEND_STRL("queryArray"), 0 TSRMLS_CC)); - } else { - MAKE_STD_ZVAL(qa); - array_init(qa); + zval old_tmp, *old = zend_read_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), 0, &old_tmp); + + ZVAL_DEREF(old); + if (Z_TYPE_P(old) == IS_ARRAY) { + array_copy(Z_ARRVAL_P(old), Z_ARRVAL(qa)); + } } - php_http_querystring_update(qa, params, NULL TSRMLS_CC); - zend_update_property(php_http_querystring_get_class_entry(), instance, ZEND_STRL("queryArray"), qa TSRMLS_CC); + php_http_querystring_update(&qa, params, NULL); + zend_update_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), &qa); zval_ptr_dtor(&qa); } -static inline void php_http_querystring_str(zval *instance, zval *return_value TSRMLS_DC) +static inline void php_http_querystring_str(zval *instance, zval *return_value) { - zval *qa = zend_read_property(php_http_querystring_get_class_entry(), instance, ZEND_STRL("queryArray"), 0 TSRMLS_CC); + zval qa_tmp, *qa = zend_read_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), 0, &qa_tmp); + ZVAL_DEREF(qa); if (Z_TYPE_P(qa) == IS_ARRAY) { - php_http_querystring_update(qa, NULL, return_value TSRMLS_CC); + php_http_querystring_update(qa, NULL, return_value); } else { RETURN_EMPTY_STRING(); } } -static inline void php_http_querystring_get(zval *this_ptr, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value TSRMLS_DC) +static inline void php_http_querystring_get(zval *instance, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value) { - zval **arrval, *qarray = zend_read_property(php_http_querystring_get_class_entry(), getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); + zval *arrval, qarray_tmp, *qarray = zend_read_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), 0, &qarray_tmp); - if ((Z_TYPE_P(qarray) == IS_ARRAY) && (SUCCESS == zend_symtable_find(Z_ARRVAL_P(qarray), name, name_len + 1, (void *) &arrval))) { - if (type) { - zval *value = php_http_ztyp(type, *arrval); - RETVAL_ZVAL(value, 1, 1); + ZVAL_DEREF(qarray); + if ((Z_TYPE_P(qarray) == IS_ARRAY) && (arrval = zend_symtable_str_find(Z_ARRVAL_P(qarray), name, name_len))) { + if (type && type != Z_TYPE_P(arrval)) { + zval tmp; + + ZVAL_DUP(&tmp, arrval); + convert_to_explicit_type(&tmp, type); + RETVAL_ZVAL(&tmp, 0, 0); } else { - RETVAL_ZVAL(*arrval, 1, 0); + RETVAL_ZVAL(arrval, 1, 0); } if (del) { - zval *delarr; + zval delarr; - MAKE_STD_ZVAL(delarr); - array_init(delarr); - add_assoc_null_ex(delarr, name, name_len + 1); - php_http_querystring_set(this_ptr, delarr, QS_MERGE TSRMLS_CC); + array_init(&delarr); + add_assoc_null_ex(&delarr, name, name_len); + php_http_querystring_set(instance, &delarr, QS_MERGE); zval_ptr_dtor(&delarr); } } else if(defval) { @@ -77,68 +87,130 @@ static inline void php_http_querystring_get(zval *this_ptr, int type, char *name } #ifdef PHP_HTTP_HAVE_ICONV -PHP_HTTP_API STATUS php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe TSRMLS_DC) +ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe) { - HashPosition pos; - zval **entry = NULL; - char *xlate_str = NULL, *xkey; - size_t xlate_len = 0, xlen; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); + zval *entry; + zend_string *xkey, *xstr; + php_http_arrkey_t key; - FOREACH_KEYVAL(pos, src, key, entry) { - if (key.type == HASH_KEY_IS_STRING) { - if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.str, key.len-1, &xkey, &xlen, oe, ie)) { - php_http_error(HE_WARNING, PHP_HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", key.len-1, key.str, ie, oe); + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(src), key.h, key.key, entry) + { + if (key.key) { + if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.key->val, key.key->len, &xkey, oe, ie)) { + php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'", key.key->len, key.key->val, ie, oe); return FAILURE; } } - if (Z_TYPE_PP(entry) == IS_STRING) { - if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), &xlate_str, &xlate_len, oe, ie)) { - if (key.type == HASH_KEY_IS_STRING) { - efree(xkey); + if (Z_TYPE_P(entry) == IS_STRING) { + if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(Z_STRVAL_P(entry), Z_STRLEN_P(entry), &xstr, oe, ie)) { + if (key.key) { + zend_string_release(xkey); } - php_http_error(HE_WARNING, PHP_HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", Z_STRLEN_PP(entry), Z_STRVAL_PP(entry), ie, oe); + php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'", Z_STRLEN_P(entry), Z_STRVAL_P(entry), ie, oe); return FAILURE; } - if (key.type == HASH_KEY_IS_STRING) { - add_assoc_stringl_ex(dst, xkey, xlen+1, xlate_str, xlate_len, 0); + if (key.key) { + add_assoc_str_ex(dst, xkey->val, xkey->len, xstr); } else { - add_index_stringl(dst, key.num, xlate_str, xlate_len, 0); + add_index_str(dst, key.h, xstr); } - } else if (Z_TYPE_PP(entry) == IS_ARRAY) { - zval *subarray; + } else if (Z_TYPE_P(entry) == IS_ARRAY) { + zval subarray; - MAKE_STD_ZVAL(subarray); - array_init(subarray); - if (key.type == HASH_KEY_IS_STRING) { - add_assoc_zval_ex(dst, xkey, xlen+1, subarray); + array_init(&subarray); + if (key.key) { + add_assoc_zval_ex(dst, xkey->val, xkey->len, &subarray); } else { - add_index_zval(dst, key.num, subarray); + add_index_zval(dst, key.h, &subarray); } - if (SUCCESS != php_http_querystring_xlate(subarray, *entry, ie, oe TSRMLS_CC)) { - if (key.type == HASH_KEY_IS_STRING) { - efree(xkey); + if (SUCCESS != php_http_querystring_xlate(&subarray, entry, ie, oe)) { + if (key.key) { + zend_string_release(xkey); } return FAILURE; } } - if (key.type == HASH_KEY_IS_STRING) { - efree(xkey); + if (key.key) { + zend_string_release(xkey); } } + ZEND_HASH_FOREACH_END(); + return SUCCESS; } #endif /* HAVE_ICONV */ -PHP_HTTP_API STATUS php_http_querystring_ctor(zval *instance, zval *params TSRMLS_DC) +ZEND_RESULT_CODE php_http_querystring_ctor(zval *instance, zval *params) { - php_http_querystring_set(instance, params, 0 TSRMLS_CC); + php_http_querystring_set(instance, params, 0); return SUCCESS; } -PHP_HTTP_API STATUS php_http_querystring_update(zval *qarray, zval *params, zval *outstring TSRMLS_DC) +static int apply_querystring(zval *val) +{ + if (Z_TYPE_P(val) == IS_ARRAY) { + zval *zvalue; + + if ((zvalue = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("value")))) { + zval tmp; + + ZVAL_COPY(&tmp, zvalue); + zval_dtor(val); + ZVAL_COPY_VALUE(val, &tmp); + } + } + + return ZEND_HASH_APPLY_KEEP; +} + +ZEND_RESULT_CODE php_http_querystring_parse(HashTable *ht, const char *str, size_t len) +{ + ZEND_RESULT_CODE 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) && asi_len) { + zval arr; + + array_init_size(&arr, asi_len); + + do { + add_next_index_stringl(&arr, asi_str++, 1); + } while (*asi_str); + + opts.param = php_http_params_separator_init(&arr); + zval_ptr_dtor(&arr); + } + + ZVAL_NULL(&opts.defval); + + if (php_http_params_parse(ht, &opts)) { + zend_hash_apply(ht, apply_querystring); + rv = SUCCESS; + } + + if (asi_len) { + php_http_params_separator_free(opts.param); + } + + zval_ptr_dtor(&opts.defval); + efree(opts.input.str); + return rv; +} + +ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *outstring) { /* enforce proper type */ if (Z_TYPE_P(qarray) != IS_ARRAY) { @@ -147,90 +219,91 @@ PHP_HTTP_API STATUS php_http_querystring_update(zval *qarray, zval *params, zval /* modify qarray */ if (params) { - HashPosition pos; - HashTable *ptr; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - zval **params_entry, **qarray_entry; - zval zv, *zv_ptr = NULL; + HashTable *ht; + php_http_arrkey_t key; + zval zv, *params_entry, *qarray_entry; - INIT_PZVAL(&zv); ZVAL_NULL(&zv); /* squeeze the hash out of the zval */ - if (Z_TYPE_P(params) == IS_OBJECT && instanceof_function(Z_OBJCE_P(params), php_http_querystring_get_class_entry() TSRMLS_CC)) { - zv_ptr = php_http_ztyp(IS_ARRAY, zend_read_property(php_http_querystring_get_class_entry(), params, ZEND_STRL("queryArray"), 0 TSRMLS_CC)); - ptr = Z_ARRVAL_P(zv_ptr); + if (Z_TYPE_P(params) == IS_OBJECT && instanceof_function(Z_OBJCE_P(params), php_http_querystring_class_entry)) { + zval qa_tmp, *qa = zend_read_property(php_http_querystring_class_entry, params, ZEND_STRL("queryArray"), 0, &qa_tmp); + + ZVAL_DEREF(qa); + convert_to_array(qa); + ht = Z_ARRVAL_P(qa); } else if (Z_TYPE_P(params) == IS_OBJECT || Z_TYPE_P(params) == IS_ARRAY) { - ptr = HASH_OF(params); + ht = HASH_OF(params); } else { - zv_ptr = php_http_ztyp(IS_STRING, params); + zend_string *zs = zval_get_string(params); + array_init(&zv); - php_default_treat_data(PARSE_STRING, estrdup(Z_STRVAL_P(zv_ptr)), &zv TSRMLS_CC); - zval_ptr_dtor(&zv_ptr); - zv_ptr = NULL; - ptr = Z_ARRVAL(zv); + php_http_querystring_parse(Z_ARRVAL(zv), zs->val, zs->len); + zend_string_release(zs); + + ht = Z_ARRVAL(zv); } - FOREACH_HASH_KEYVAL(pos, ptr, key, params_entry) { + ZEND_HASH_FOREACH_KEY_VAL_IND(ht, key.h, key.key, params_entry) + { /* only public properties */ - if (key.type != HASH_KEY_IS_STRING || *key.str) { - if (Z_TYPE_PP(params_entry) == IS_NULL) { + if (!key.key || *key.key->val) { + if (Z_TYPE_P(params_entry) == IS_NULL) { /* * delete */ - if (key.type == HASH_KEY_IS_STRING) { - zend_hash_del(Z_ARRVAL_P(qarray), key.str, key.len); + if (key.key) { + zend_hash_del(Z_ARRVAL_P(qarray), key.key); } else { - zend_hash_index_del(Z_ARRVAL_P(qarray), key.num); + zend_hash_index_del(Z_ARRVAL_P(qarray), key.h); } - } else if ( ((key.type == HASH_KEY_IS_STRING) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), key.str, key.len, (void *) &qarray_entry))) - || ((key.type == HASH_KEY_IS_LONG) && (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(qarray), key.num, (void *) &qarray_entry)))) { + } else if ( ((key.key) && (qarray_entry = zend_hash_find(Z_ARRVAL_P(qarray), key.key))) + || ((!key.key) && (qarray_entry = zend_hash_index_find(Z_ARRVAL_P(qarray), key.h)))) { /* * update */ - zval equal, *entry = NULL; + zval equal, tmp, *entry = &tmp; + ZVAL_UNDEF(&tmp); /* recursive */ - if (Z_TYPE_PP(params_entry) == IS_ARRAY || Z_TYPE_PP(params_entry) == IS_OBJECT) { - entry = php_http_zsep(1, IS_ARRAY, *qarray_entry); - php_http_querystring_update(entry, *params_entry, NULL TSRMLS_CC); - } else if ((FAILURE == is_equal_function(&equal, *qarray_entry, *params_entry TSRMLS_CC)) || !Z_BVAL(equal)) { - Z_ADDREF_PP(params_entry); - entry = *params_entry; + if (Z_TYPE_P(params_entry) == IS_ARRAY || Z_TYPE_P(params_entry) == IS_OBJECT) { + ZVAL_DUP(entry, qarray_entry); + convert_to_array(entry); + php_http_querystring_update(entry, params_entry, NULL); + } else if ((FAILURE == is_equal_function(&equal, qarray_entry, params_entry)) || Z_TYPE(equal) != IS_TRUE) { + Z_TRY_ADDREF_P(params_entry); + entry = params_entry; } if (entry) { - if (key.type == HASH_KEY_IS_STRING) { - zend_hash_update(Z_ARRVAL_P(qarray), key.str, key.len, (void *) &entry, sizeof(zval *), NULL); + if (key.key) { + zend_hash_update(Z_ARRVAL_P(qarray), key.key, entry); } else { - zend_hash_index_update(Z_ARRVAL_P(qarray), key.num, (void *) &entry, sizeof(zval *), NULL); + zend_hash_index_update(Z_ARRVAL_P(qarray), key.h, entry); } } } else { - zval *entry; + zval entry, *entry_ptr = &entry; /* * add */ - if (Z_TYPE_PP(params_entry) == IS_OBJECT) { - MAKE_STD_ZVAL(entry); - array_init(entry); - php_http_querystring_update(entry, *params_entry, NULL TSRMLS_CC); + if (Z_TYPE_P(params_entry) == IS_OBJECT) { + array_init(&entry); + php_http_querystring_update(&entry, params_entry, NULL); } else { - Z_ADDREF_PP(params_entry); - entry = *params_entry; + Z_TRY_ADDREF_P(params_entry); + entry_ptr = params_entry; } - if (key.type == HASH_KEY_IS_STRING) { - add_assoc_zval_ex(qarray, key.str, key.len, entry); + if (key.key) { + add_assoc_zval_ex(qarray, key.key->val, key.key->len, entry_ptr); } else { - add_index_zval(qarray, key.num, entry); + add_index_zval(qarray, key.h, entry_ptr); } } } } - /* clean up */ - if (zv_ptr) { - zval_ptr_dtor(&zv_ptr); - } + ZEND_HASH_FOREACH_END(); + zval_dtor(&zv); } @@ -239,11 +312,11 @@ PHP_HTTP_API STATUS php_http_querystring_update(zval *qarray, zval *params, zval char *s; size_t l; - if (SUCCESS == php_http_url_encode_hash(Z_ARRVAL_P(qarray), NULL, 0, &s, &l TSRMLS_CC)) { + if (SUCCESS == php_http_url_encode_hash(Z_ARRVAL_P(qarray), NULL, 0, &s, &l)) { zval_dtor(outstring); - ZVAL_STRINGL(outstring, s, l, 0); + ZVAL_STR(outstring, php_http_cs2zs(s, l)); } else { - php_http_error(HE_WARNING, PHP_HTTP_E_QUERYSTRING, "Failed to encode query string"); + php_error_docref(NULL, E_WARNING, "Failed to encode query string"); return FAILURE; } } @@ -251,225 +324,102 @@ PHP_HTTP_API STATUS php_http_querystring_update(zval *qarray, zval *params, zval 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); - -static zend_class_entry *php_http_querystring_class_entry; - -zend_class_entry *php_http_querystring_get_class_entry(void) -{ - return php_http_querystring_class_entry; -} - -static 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_get_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; + zend_error_handling zeh; - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", ¶ms)) { - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { - php_http_querystring_set(getThis(), params, 0 TSRMLS_CC); - } end_error_handling(); - } - } end_error_handling(); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z", ¶ms), invalid_arg, return); + + zend_replace_error_handling(EH_THROW, php_http_exception_bad_querystring_class_entry, &zeh); + php_http_querystring_set(getThis(), params, 0); + zend_restore_error_handling(&zeh); } +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_get_class_entry()) { - if (SUCCESS == zend_parse_parameters_none()) { - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { - zval *instance = *zend_std_get_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), 0, NULL TSRMLS_CC); + zval *instance, *_GET; + zend_string *zs; - if (Z_TYPE_P(instance) != IS_OBJECT) { - zval **_GET = NULL; + php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - zend_is_auto_global("_GET", lenof("_GET") TSRMLS_CC); + zs = zend_string_init(ZEND_STRL("instance"), 0); + instance = zend_std_get_static_property(php_http_querystring_class_entry, zs, 0); + zend_string_release(zs); - if ((SUCCESS == zend_hash_find(&EG(symbol_table), "_GET", sizeof("_GET"), (void *) &_GET)) - && (Z_TYPE_PP(_GET) == IS_ARRAY) - ) { - MAKE_STD_ZVAL(instance); - ZVAL_OBJVAL(instance, php_http_querystring_object_new(php_http_querystring_class_entry TSRMLS_CC), 0); + if (Z_TYPE_P(instance) == IS_OBJECT) { + RETVAL_ZVAL(instance, 1, 0); + } else if ((_GET = php_http_env_get_superglobal(ZEND_STRL("_GET")))) { + ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry)); - SEPARATE_ZVAL_TO_MAKE_IS_REF(_GET); - convert_to_array(*_GET); - zend_update_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), *_GET TSRMLS_CC); + ZVAL_MAKE_REF(_GET); + zend_update_property(php_http_querystring_class_entry, return_value, ZEND_STRL("queryArray"), _GET); + + zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), return_value); + } else { + php_http_throw(unexpected_val, "Could not acquire reference to superglobal GET array", NULL); + } - zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), instance TSRMLS_CC); - zval_ptr_dtor(&instance); - } else { - php_http_error(HE_WARNING, PHP_HTTP_E_QUERYSTRING, "Could not acquire reference to superglobal GET array"); - } - } - RETVAL_ZVAL(instance, 1, 0); - } end_error_handling(); - } - } 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_get_class_entry()) { - if (SUCCESS == zend_parse_parameters_none()) { - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { - zval *retval = NULL, *qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); - - object_init_ex(return_value, spl_ce_RecursiveArrayIterator); - zend_call_method_with_1_params(&return_value, spl_ce_RecursiveArrayIterator, NULL, "__construct", &retval, qa); - if (retval) { - zval_ptr_dtor(&retval); - } - } end_error_handling(); - } - } end_error_handling(); + zval qa_tmp, *qa; + + php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); + + qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &qa_tmp); + + object_init_ex(return_value, spl_ce_RecursiveArrayIterator); + zend_call_method_with_1_params(return_value, spl_ce_RecursiveArrayIterator, NULL, "__construct", NULL, qa); } +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); + php_http_querystring_str(getThis(), return_value); } +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_tmp, *zqa; + + if (SUCCESS != zend_parse_parameters_none()) { + return; } - RETURN_FALSE; + + zqa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &zqa_tmp); + RETURN_ZVAL(zqa, 1, 0); } +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; - int name_len = 0; - long type = 0; + size_t name_len = 0; + zend_long type = 0; zend_bool del = 0; zval *ztype = NULL, *defval = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|szzb", &name_str, &name_len, &ztype, &defval, &del)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|szzb", &name_str, &name_len, &ztype, &defval, &del)) { if (name_str && name_len) { if (ztype) { if (Z_TYPE_P(ztype) == IS_LONG) { @@ -495,51 +445,63 @@ PHP_METHOD(HttpQueryString, get) } } } - php_http_querystring_get(getThis(), type, name_str, name_len, defval, del, return_value TSRMLS_CC); + php_http_querystring_get(getThis(), type, name_str, name_len, defval, del, return_value); } else { - php_http_querystring_str(getThis(), return_value TSRMLS_CC); + php_http_querystring_str(getThis(), return_value); } } } +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; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) { - RETURN_FALSE; + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "z", ¶ms)) { + return; } - php_http_querystring_set(getThis(), params, QS_MERGE TSRMLS_CC); + php_http_querystring_set(getThis(), params, QS_MERGE); 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; + zval qa_tmp, *params, *instance = getThis(); + zend_error_handling zeh; + + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z", ¶ms), invalid_arg, return); - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) { - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { - ZVAL_OBJVAL(return_value, Z_OBJ_HT_P(getThis())->clone_obj(getThis() TSRMLS_CC), 0); - php_http_querystring_set(return_value, params, QS_MERGE TSRMLS_CC); - } end_error_handling(); - } - } end_error_handling(); + zend_replace_error_handling(EH_THROW, php_http_exception_bad_querystring_class_entry, &zeh); + ZVAL_OBJ(return_value, Z_OBJ_HT_P(instance)->clone_obj(instance)); + /* make sure we do not inherit the reference to _GET */ + SEPARATE_ZVAL(zend_read_property(Z_OBJCE_P(return_value), return_value, ZEND_STRL("queryArray"), 0, &qa_tmp)); + php_http_querystring_set(return_value, params, QS_MERGE); + zend_restore_error_handling(&zeh); } +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) \ { \ char *name; \ - int name_len; \ + size_t name_len; \ zval *defval = NULL; \ zend_bool del = 0; \ - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|zb", &name, &name_len, &defval, &del)) { \ - php_http_querystring_get(getThis(), TYPE, name, name_len, defval, del, return_value TSRMLS_CC); \ + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|zb", &name, &name_len, &defval, &del)) { \ + php_http_querystring_get(getThis(), TYPE, name, name_len, defval, del, return_value); \ } \ } -PHP_HTTP_QUERYSTRING_GETTER(getBool, IS_BOOL); +PHP_HTTP_QUERYSTRING_GETTER(getBool, _IS_BOOL); PHP_HTTP_QUERYSTRING_GETTER(getInt, IS_LONG); PHP_HTTP_QUERYSTRING_GETTER(getFloat, IS_DOUBLE); PHP_HTTP_QUERYSTRING_GETTER(getString, IS_STRING); @@ -547,128 +509,213 @@ PHP_HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY); 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_get_class_entry()) { - char *ie, *oe; - int ie_len, oe_len; - - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &ie, &ie_len, &oe, &oe_len)) { - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { - zval *na, *qa = php_http_ztyp(IS_ARRAY, zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC)); - - MAKE_STD_ZVAL(na); - array_init(na); - if (SUCCESS == php_http_querystring_xlate(na, qa, ie, oe TSRMLS_CC)) { - php_http_querystring_set(getThis(), na, 0 TSRMLS_CC); - } + char *ie, *oe; + size_t ie_len, oe_len; + zval na, qa_tmp, *qa; - zval_ptr_dtor(&na); - zval_ptr_dtor(&qa); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &ie, &ie_len, &oe, &oe_len), invalid_arg, return); - RETVAL_ZVAL(getThis(), 1, 0); - } end_error_handling(); - } - } end_error_handling(); + array_init(&na); + qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &qa_tmp); + ZVAL_DEREF(qa); + convert_to_array(qa); + + php_http_expect(SUCCESS == php_http_querystring_xlate(&na, qa, ie, oe), bad_conversion, + zval_ptr_dtor(&na); + return; + ); + + php_http_querystring_set(getThis(), &na, 0); + RETVAL_ZVAL(getThis(), 1, 0); + zval_ptr_dtor(&na); } #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); + php_http_querystring_str(getThis(), return_value); } +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; - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &serialized)) { - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { - if (Z_TYPE_P(serialized) == IS_STRING) { - php_http_querystring_set(getThis(), serialized, 0 TSRMLS_CC); - } else { - php_http_error(HE_WARNING, PHP_HTTP_E_QUERYSTRING, "Expected a string as parameter"); - } - } end_error_handling(); - } - } end_error_handling(); + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "z", &serialized)) { + return; + } + + if (Z_TYPE_P(serialized) == IS_STRING) { + php_http_querystring_set(getThis(), serialized, 0); + } else { + php_error_docref(NULL, E_WARNING, "Expected a string as parameter"); + } } +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; - int offset_len; - zval **value; + zend_string *offset; + zval *value, qa_tmp, *qa; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &offset)) { + return; + } - if ((SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len))) { - zval *qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); + qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &qa_tmp); + ZVAL_DEREF(qa); - if (Z_TYPE_P(qa) == IS_ARRAY - && SUCCESS == zend_symtable_find(Z_ARRVAL_P(qa), offset_str, offset_len + 1, (void *) &value) - ) { - RETVAL_ZVAL(*value, 1, 0); + if (Z_TYPE_P(qa) == IS_ARRAY) { + if ((value = zend_symtable_find(Z_ARRVAL_P(qa), offset))) { + RETVAL_ZVAL(value, 1, 0); } } } +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; - int offset_len; - zval *value; + zend_string *offset; + zval *value, param, znull; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &offset_str, &offset_len, &value)) { - zval *param; - - MAKE_STD_ZVAL(param); - array_init(param); - Z_ADDREF_P(value); - add_assoc_zval_ex(param, offset_str, offset_len + 1, value); - php_http_querystring_set(getThis(), param, 0 TSRMLS_CC); - zval_ptr_dtor(¶m); + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "Sz", &offset, &value)) { + return; } + + array_init_size(¶m, 1); + /* unset first */ + ZVAL_NULL(&znull); + zend_symtable_update(Z_ARRVAL(param), offset, &znull); + php_http_querystring_set(getThis(), ¶m, QS_MERGE); + /* then update, else QS_MERGE would merge sub-arrrays */ + Z_TRY_ADDREF_P(value); + zend_symtable_update(Z_ARRVAL(param), offset, value); + php_http_querystring_set(getThis(), ¶m, QS_MERGE); + zval_ptr_dtor(¶m); } +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; - int offset_len; - zval **value; + zend_string *offset; + zval *value, qa_tmp, *qa; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &offset)) { + return; + } - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) { - zval *qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); - - if (Z_TYPE_P(qa) == IS_ARRAY - && SUCCESS == zend_symtable_find(Z_ARRVAL_P(qa), offset_str, offset_len + 1, (void *) &value) - && Z_TYPE_PP(value) != IS_NULL - ) { - RETURN_TRUE; + qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &qa_tmp); + ZVAL_DEREF(qa); + + if (Z_TYPE_P(qa) == IS_ARRAY) { + if ((value = zend_symtable_find(Z_ARRVAL_P(qa), offset))) { + RETURN_BOOL(Z_TYPE_P(value) != IS_NULL); } - RETURN_FALSE; } + RETURN_FALSE; } +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; - int offset_len; + zend_string *offset; + zval param, znull; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) { - zval *param; - - MAKE_STD_ZVAL(param); - array_init(param); - add_assoc_null_ex(param, offset_str, offset_len + 1); - php_http_querystring_set(getThis(), param, QS_MERGE TSRMLS_CC); - zval_ptr_dtor(¶m); + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &offset)) { + return; } + + array_init(¶m); + ZVAL_NULL(&znull); + zend_symtable_update(Z_ARRVAL(param), offset, &znull); + php_http_querystring_set(getThis(), ¶m, QS_MERGE); + zval_ptr_dtor(¶m); } +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(&ce); + php_http_querystring_class_entry->create_object = php_http_querystring_object_new; + zend_class_implements(php_http_querystring_class_entry, 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)); + zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("queryArray"), ZEND_ACC_PRIVATE); + + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_BOOL"), PHP_HTTP_QUERYSTRING_TYPE_BOOL); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_INT"), PHP_HTTP_QUERYSTRING_TYPE_INT); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_FLOAT"), PHP_HTTP_QUERYSTRING_TYPE_FLOAT); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_STRING"), PHP_HTTP_QUERYSTRING_TYPE_STRING); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_ARRAY"), PHP_HTTP_QUERYSTRING_TYPE_ARRAY); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_OBJECT"), PHP_HTTP_QUERYSTRING_TYPE_OBJECT); + + return SUCCESS; +} /* * Local variables: