X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_requestdatashare_object.c;h=eed7d6b8ef125ecfb08c36e2a2f70c0a52b02d10;hp=eaa2186035d824660402f8d20f66d29c13f67696;hb=refs%2Fheads%2Fv1.7.x;hpb=fb8b98d958d628027081c1a140c488665588d37c diff --git a/http_requestdatashare_object.c b/http_requestdatashare_object.c index eaa2186..eed7d6b 100644 --- a/http_requestdatashare_object.c +++ b/http_requestdatashare_object.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2006, Michael Wallner | + | Copyright (c) 2004-2010, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -60,13 +60,13 @@ HTTP_END_ARGS; #define http_requestdatashare_object_read_prop _http_requestdatashare_object_read_prop -static zval *_http_requestdatashare_object_read_prop(zval *object, zval *member, int type TSRMLS_DC); +static zval *_http_requestdatashare_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC); #define http_requestdatashare_object_write_prop _http_requestdatashare_object_write_prop -static void _http_requestdatashare_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC); +static void _http_requestdatashare_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC); #define http_requestdatashare_instantiate(t, g) _http_requestdatashare_instantiate((t), (g) TSRMLS_CC) static inline zval *_http_requestdatashare_instantiate(zval *this_ptr, zend_bool global TSRMLS_DC); -#define OBJ_PROP_CE http_requestdatashare_object_ce +#define THIS_CE http_requestdatashare_object_ce zend_class_entry *http_requestdatashare_object_ce; zend_function_entry http_requestdatashare_object_fe[] = { HTTP_RSHARE_ME(__destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) @@ -93,11 +93,11 @@ PHP_MINIT_FUNCTION(http_requestdatashare_object) zend_class_implements(http_requestdatashare_object_ce TSRMLS_CC, 1, spl_ce_Countable); #endif - DCL_STATIC_PROP_N(PRIVATE, instance); - DCL_PROP(PUBLIC, bool, cookie, 0); - DCL_PROP(PUBLIC, bool, dns, 0); - DCL_PROP(PUBLIC, bool, ssl, 0); - DCL_PROP(PUBLIC, bool, connect, 0); + zend_declare_property_null(THIS_CE, ZEND_STRS("instance")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("cookie")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("dns")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("ssl")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("connect")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); return SUCCESS; } @@ -125,9 +125,14 @@ zend_object_value _http_requestdatashare_object_new_ex(zend_class_entry *ce, htt *ptr = o; } +#ifdef ZEND_ENGINE_2_4 + zend_object_std_init(o, ce TSRMLS_CC); + object_properties_init(o, ce); +#else 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 *)); +#endif ov.handle = putObject(http_requestdatashare_object, o); ov.handlers = &http_requestdatashare_object_handlers; @@ -145,35 +150,41 @@ void _http_requestdatashare_object_free(zend_object *object TSRMLS_DC) freeObject(o); } -static zval *_http_requestdatashare_object_read_prop(zval *object, zval *member, int type TSRMLS_DC) +static zval *_http_requestdatashare_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC) { - if (type == BP_VAR_W && zend_hash_exists(&OBJ_PROP_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)) { + if (type == BP_VAR_W && +#ifdef ZEND_ENGINE_2_4 + zend_hash_exists(&THIS_CE->properties_info, Z_STRVAL_P(member), Z_STRLEN_P(member)+1) +#else + zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1) +#endif + ) { zend_error(E_ERROR, "Cannot access HttpRequestDataShare default properties by reference or array key/index"); return NULL; } - return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC); + return zend_get_std_object_handlers()->read_property(object, member, type ZEND_LITERAL_KEY_CC TSRMLS_CC); } -static void _http_requestdatashare_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC) +static void _http_requestdatashare_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC) { - if (zend_hash_exists(&OBJ_PROP_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)) { + if ( +#ifdef ZEND_ENGINE_2_4 + zend_hash_exists(&THIS_CE->properties_info, Z_STRVAL_P(member), Z_STRLEN_P(member)+1) +#else + zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1) +#endif + ) { int status; - zval *orig = value; getObjectEx(http_requestdatashare_object, obj, object); - SEPARATE_ZVAL_IF_NOT_REF(&value); - status = http_request_datashare_set(obj->share, Z_STRVAL_P(member), Z_STRLEN_P(member), (zend_bool) zval_is_true(value)); - if (orig != value) { - zval_ptr_dtor(&value); - value = orig; - } + status = http_request_datashare_set(obj->share, Z_STRVAL_P(member), Z_STRLEN_P(member), (zend_bool) i_zend_is_true(value)); if (SUCCESS != status) { return; } } - zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC); + zend_get_std_object_handlers()->write_property(object, member, value ZEND_LITERAL_KEY_CC TSRMLS_CC); } /* {{{ proto void HttpRequestDataShare::__destruct() @@ -253,7 +264,7 @@ PHP_METHOD(HttpRequestDataShare, factory) PHP_METHOD(HttpRequestDataShare, singleton) { zend_bool global = 0; - 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)) { @@ -275,7 +286,7 @@ PHP_METHOD(HttpRequestDataShare, 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); } } @@ -293,16 +304,16 @@ static inline zval *_http_requestdatashare_instantiate(zval *this_ptr, zend_bool } if (global) { if (HTTP_G->request.datashare.cookie) { - UPD_PROP(bool, cookie, HTTP_G->request.datashare.cookie); + zend_update_property_bool(THIS_CE, getThis(), ZEND_STRS("cookie")-1, HTTP_G->request.datashare.cookie TSRMLS_CC); } if (HTTP_G->request.datashare.dns) { - UPD_PROP(bool, dns, HTTP_G->request.datashare.dns); + zend_update_property_bool(THIS_CE, getThis(), ZEND_STRS("dns")-1, HTTP_G->request.datashare.dns TSRMLS_CC); } if (HTTP_G->request.datashare.ssl) { - UPD_PROP(bool, ssl, HTTP_G->request.datashare.ssl); + zend_update_property_bool(THIS_CE, getThis(), ZEND_STRS("ssl")-1, HTTP_G->request.datashare.ssl TSRMLS_CC); } if (HTTP_G->request.datashare.connect) { - UPD_PROP(bool, connect, HTTP_G->request.datashare.connect); + zend_update_property_bool(THIS_CE, getThis(), ZEND_STRS("connect")-1, HTTP_G->request.datashare.connect TSRMLS_CC); } } return this_ptr;