X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_querystring_object.c;h=88d4c835c90440b2ee208b043c007db816f8410a;hp=39e3b89987ea3d31f44a43ef7bf45f3d0d01029a;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=aca5a5a21e4514707a71cfa69cc19ae50a78f5d3 diff --git a/http_querystring_object.c b/http_querystring_object.c index 39e3b89..88d4c83 100644 --- a/http_querystring_object.c +++ b/http_querystring_object.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2007, Michael Wallner | + | Copyright (c) 2004-2010, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -101,7 +101,7 @@ HTTP_BEGIN_ARGS(offsetUnset, 1) HTTP_END_ARGS; -#define OBJ_PROP_CE http_querystring_object_ce +#define THIS_CE http_querystring_object_ce zend_class_entry *http_querystring_object_ce; zend_function_entry http_querystring_object_fe[] = { HTTP_QUERYSTRING_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR|ZEND_ACC_FINAL) @@ -151,17 +151,17 @@ PHP_MINIT_FUNCTION(http_querystring_object) zend_class_implements(http_querystring_object_ce TSRMLS_CC, 2, zend_ce_serializable, zend_ce_arrayaccess); #endif - DCL_STATIC_PROP_N(PRIVATE, instance); - DCL_PROP_N(PRIVATE, queryArray); - DCL_PROP(PRIVATE, string, queryString, ""); + zend_declare_property_null(THIS_CE, ZEND_STRS("instance")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("queryArray")-1, ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("queryString")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); #ifndef WONKY - DCL_CONST(long, "TYPE_BOOL", HTTP_QUERYSTRING_TYPE_BOOL); - DCL_CONST(long, "TYPE_INT", HTTP_QUERYSTRING_TYPE_INT); - DCL_CONST(long, "TYPE_FLOAT", HTTP_QUERYSTRING_TYPE_FLOAT); - DCL_CONST(long, "TYPE_STRING", HTTP_QUERYSTRING_TYPE_STRING); - DCL_CONST(long, "TYPE_ARRAY", HTTP_QUERYSTRING_TYPE_ARRAY); - DCL_CONST(long, "TYPE_OBJECT", HTTP_QUERYSTRING_TYPE_OBJECT); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_BOOL")-1, HTTP_QUERYSTRING_TYPE_BOOL TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_INT")-1, HTTP_QUERYSTRING_TYPE_INT TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_FLOAT")-1, HTTP_QUERYSTRING_TYPE_FLOAT TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_STRING")-1, HTTP_QUERYSTRING_TYPE_STRING TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_ARRAY")-1, HTTP_QUERYSTRING_TYPE_ARRAY TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_OBJECT")-1, HTTP_QUERYSTRING_TYPE_OBJECT TSRMLS_CC); #endif HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_BOOL", HTTP_QUERYSTRING_TYPE_BOOL); @@ -191,9 +191,13 @@ zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, void *no *ptr = o; } +#if PHP_VERSION_ID < 50399 ALLOC_HASHTABLE(OBJ_PROP(o)); zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); +#else + object_properties_init(&o->zo, ce); +#endif ov.handle = putObject(http_querystring_object, o); ov.handlers = &http_querystring_object_handlers; @@ -245,28 +249,35 @@ static inline zval *_http_querystring_instantiate(zval *this_ptr, zend_bool glob convert_to_string(qstring); } - SET_PROP(queryArray, qarray); - SET_PROP(queryString, qstring); - GET_PROP(queryArray)->is_ref = 1; - GET_PROP(queryString)->is_ref = 1; + zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, qarray TSRMLS_CC); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, qstring TSRMLS_CC); +#ifdef Z_SET_ISREF + Z_SET_ISREF_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)); + Z_SET_ISREF_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); +#else + zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)->is_ref = 1; + zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)->is_ref = 1; +#endif if (params) { - http_querystring_modify(GET_PROP(queryArray), params); + http_querystring_modify(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), params); } if (!defer_update) { - http_querystring_update(GET_PROP(queryArray), GET_PROP(queryString)); + http_querystring_update(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); } } } else { - qarray = ecalloc(1, sizeof(zval)); + MAKE_STD_ZVAL(qarray); array_init(qarray); - SET_PROP(queryArray, qarray); - UPD_STRL(queryString, "", 0); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, qarray TSRMLS_CC); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryString")-1, "", 0 TSRMLS_CC); if (params && http_querystring_modify(qarray, params) && !defer_update) { - http_querystring_update(qarray, GET_PROP(queryString)); + http_querystring_update(qarray, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); } + + zval_ptr_dtor(&qarray); } return this_ptr; @@ -275,17 +286,18 @@ static inline zval *_http_querystring_instantiate(zval *this_ptr, zend_bool glob #define http_querystring_get(o, t, n, l, def, del, r) _http_querystring_get((o), (t), (n), (l), (def), (del), (r) TSRMLS_CC) static inline void _http_querystring_get(zval *this_ptr, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value TSRMLS_DC) { - zval **arrval, *qarray = GET_PROP(queryArray); + zval **arrval, *qarray = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC); if ((Z_TYPE_P(qarray) == IS_ARRAY) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), name, name_len + 1, (void *) &arrval))) { - RETVAL_ZVAL(*arrval, 1, 0); - if (type) { - convert_to_type(type, return_value); + zval *value = http_zsep(type, *arrval); + RETVAL_ZVAL(value, 1, 1); + } else { + RETVAL_ZVAL(*arrval, 1, 0); } if (del && (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarray), name, name_len + 1))) { - http_querystring_update(qarray, GET_PROP(queryString)); + http_querystring_update(qarray, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); } } else if(defval) { RETURN_ZVAL(defval, 1, 0); @@ -397,9 +409,9 @@ PHP_METHOD(HttpQueryString, set) zval *params; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) { - zval *qarray = GET_PROP(queryArray); + zval *qarray = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC); if (http_querystring_modify(qarray, params)) { - http_querystring_update(qarray, GET_PROP(queryString)); + http_querystring_update(qarray, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); } } @@ -416,9 +428,9 @@ PHP_METHOD(HttpQueryString, mod) zval *zobj, *qarr, *qstr, *params; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) { - zobj = http_querystring_instantiate(NULL, 0, GET_PROP(queryArray), 1); - qarr = GET_PROP_EX(zobj, queryArray); - qstr = GET_PROP_EX(zobj, queryString); + zobj = http_querystring_instantiate(NULL, 0, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), 1); + qarr = zend_read_property(THIS_CE, zobj, ZEND_STRS("queryArray")-1, 0 TSRMLS_CC); + qstr = zend_read_property(THIS_CE, zobj, ZEND_STRS("queryString")-1, 0 TSRMLS_CC); http_querystring_modify(qarr, params); http_querystring_update(qarr, qstr); @@ -434,7 +446,7 @@ PHP_METHOD(HttpQueryString, mod) PHP_METHOD(HttpQueryString, singleton) { zend_bool global = 1; - zval *instance = GET_STATIC_PROP(instance); + zval *instance = *zend_std_get_static_property(THIS_CE, ZEND_STRS("instance")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); SET_EH_THROW_HTTP(); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &global)) { @@ -456,7 +468,7 @@ PHP_METHOD(HttpQueryString, singleton) add_index_zval(instance, global, zobj); RETVAL_OBJECT(zobj, 1); - SET_STATIC_PROP(instance, instance); + zend_update_static_property(THIS_CE, ZEND_STRS("instance")-1, instance TSRMLS_CC); zval_ptr_dtor(&instance); } } @@ -499,8 +511,8 @@ PHP_METHOD(HttpQueryString, xlate) RETURN_FALSE; } - qa = GET_PROP(queryArray); - qs = GET_PROP(queryString); + qa = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC); + qs = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC); INIT_PZVAL(&xa); array_init(&xa); @@ -552,7 +564,7 @@ PHP_METHOD(HttpQueryString, offsetGet) zval **value; if ( (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) && - (SUCCESS == zend_hash_find(Z_ARRVAL_P(GET_PROP(queryArray)), offset_str, offset_len + 1, (void *) &value))) { + (SUCCESS == zend_hash_find(Z_ARRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)), offset_str, offset_len + 1, (void *) &value))) { RETVAL_ZVAL(*value, 1, 0); } } @@ -567,7 +579,7 @@ PHP_METHOD(HttpQueryString, offsetSet) zval *value; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &offset_str, &offset_len, &value)) { - zval *qarr = GET_PROP(queryArray), *qstr = GET_PROP(queryString); + zval *qarr = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), *qstr = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC); ZVAL_ADDREF(value); add_assoc_zval_ex(qarr, offset_str, offset_len + 1, value); @@ -585,7 +597,7 @@ PHP_METHOD(HttpQueryString, offsetExists) zval **value; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) { - RETURN_BOOL((SUCCESS == zend_hash_find(Z_ARRVAL_P(GET_PROP(queryArray)), offset_str, offset_len + 1, (void *) &value)) && (Z_TYPE_PP(value) != IS_NULL)); + RETURN_BOOL((SUCCESS == zend_hash_find(Z_ARRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)), offset_str, offset_len + 1, (void *) &value)) && (Z_TYPE_PP(value) != IS_NULL)); } } /* }}} */ @@ -598,10 +610,10 @@ PHP_METHOD(HttpQueryString, offsetUnset) int offset_len; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) { - zval *qarr = GET_PROP(queryArray); + zval *qarr = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC); if (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarr), offset_str, offset_len + 1)) { - http_querystring_update(qarr, GET_PROP(queryString)); + http_querystring_update(qarr, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); } } }