static int php_http_client_datashare_compare_handles(void *h1, void *h2);
-PHP_HTTP_API php_http_client_datashare_t *php_http_client_datashare_init(php_http_client_datashare_t *h, php_http_client_datashare_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC)
+PHP_HTTP_API php_http_client_datashare_t *php_http_client_datashare_init(php_http_client_datashare_t *h, php_http_client_datashare_ops_t *ops, php_resource_factory_t *rf, void *init_arg TSRMLS_DC)
{
php_http_client_datashare_t *free_h = NULL;
if (!h) {
free_h = h = emalloc(sizeof(*h));
}
- memset(h, sizeof(*h), 0);
+ memset(h, 0, sizeof(*h));
zend_llist_init(&h->clients, sizeof(zval *), ZVAL_PTR_DTOR, 0);
h->ops = ops;
- h->rf = rf ? rf : php_http_resource_factory_init(NULL, h->ops->rsrc, NULL, NULL);
+ if (rf) {
+ h->rf = rf;
+ } else if (ops->rsrc) {
+ h->rf = php_resource_factory_init(NULL, h->ops->rsrc, h, NULL);
+ }
TSRMLS_SET_CTX(h->ts);
if (h->ops->init) {
h->ops->dtor(h);
}
zend_llist_destroy(&h->clients);
- php_http_resource_factory_free(&h->rf);
+ php_resource_factory_free(&h->rf);
}
PHP_HTTP_API void php_http_client_datashare_free(php_http_client_datashare_t **h)
PHP_HTTP_ARG_OBJ(http\\Client, client, 0)
PHP_HTTP_END_ARGS;
-static void php_http_client_datashare_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *literal_key TSRMLS_DC);
+static void php_http_client_datashare_object_write_prop(zval *object, zval *member, zval *value PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC);
+
+static zend_class_entry *php_http_client_datashare_class_entry;
+
+zend_class_entry *php_http_client_datashare_get_class_entry(void)
+{
+ return php_http_client_datashare_class_entry;
+}
-zend_class_entry *php_http_client_datashare_class_entry;
-zend_function_entry php_http_client_datashare_method_entry[] = {
+static zend_function_entry php_http_client_datashare_method_entry[] = {
PHP_HTTP_RSHARE_ME(__destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
PHP_HTTP_RSHARE_ME(count, ZEND_ACC_PUBLIC)
PHP_HTTP_RSHARE_ME(attach, ZEND_ACC_PUBLIC)
{
return &php_http_client_datashare_object_handlers;
}
+static STATUS setopt(struct php_http_client_datashare *h, php_http_client_datashare_setopt_opt_t opt, void *arg)
+{
+ return SUCCESS;
+}
+
+static php_http_client_datashare_ops_t php_http_client_datashare_user_ops = {
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ setopt,
+ (php_http_new_t) php_http_client_datashare_object_new_ex,
+ php_http_client_datashare_get_class_entry
+};
zend_object_value php_http_client_datashare_object_new(zend_class_entry *ce TSRMLS_DC)
{
return php_http_client_datashare_object_new_ex(ce, NULL, NULL TSRMLS_CC);
zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
object_properties_init((zend_object *) o, ce);
- if (share) {
- o->share = share;
- } else {
- o->share = php_http_client_datashare_init(NULL, NULL, NULL, NULL TSRMLS_CC);
+ ov.handle = zend_objects_store_put(o, NULL, php_http_client_datashare_object_free, NULL TSRMLS_CC);
+ ov.handlers = &php_http_client_datashare_object_handlers;
+
+ if (!(o->share = share)) {
+ o->share = php_http_client_datashare_init(NULL, &php_http_client_datashare_user_ops, NULL, &ov TSRMLS_CC);
}
if (ptr) {
*ptr = o;
}
- ov.handle = zend_objects_store_put(o, NULL, php_http_client_datashare_object_free, NULL TSRMLS_CC);
- ov.handlers = &php_http_client_datashare_object_handlers;
-
return ov;
}
efree(o);
}
-static void php_http_client_datashare_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *literal_key TSRMLS_DC)
+static zval *php_http_client_datashare_object_read_prop(zval *object, zval *member, int type PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC)
+{
+ zend_property_info *pi;
+
+ if ((pi = zend_get_property_info(php_http_client_datashare_class_entry, member, 1 TSRMLS_CC))) {
+ if (type != BP_VAR_R) {
+ zval *zproxy;
+ php_property_proxy_t *proxy;
+
+ proxy = php_property_proxy_init(object, pi->name, pi->name_length TSRMLS_CC);
+
+ MAKE_STD_ZVAL(zproxy);
+#ifdef Z_SET_REFCOUNT_P
+ Z_SET_REFCOUNT_P(zproxy, 0);
+#else
+ zproxy->refcount = 0;
+#endif
+ ZVAL_OBJVAL(zproxy, php_property_proxy_object_new_ex(php_property_proxy_get_class_entry(), proxy, NULL TSRMLS_CC), 0);
+ return zproxy;
+ }
+ }
+ return zend_get_std_object_handlers()->read_property(object, member, type PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC);
+}
+
+static void php_http_client_datashare_object_write_prop(zval *object, zval *member, zval *value PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC)
{
zend_property_info *pi;
}
}
- zend_get_std_object_handlers()->write_property(object, member, value, literal_key TSRMLS_CC);
-}
-
-static zval **php_http_client_datashare_object_get_prop_ptr(zval *object, zval *member, const zend_literal *literal_key TSRMLS_DC)
-{
- zend_property_info *pi;
-
- if ((pi = zend_get_property_info(php_http_client_datashare_class_entry, member, 1 TSRMLS_CC))) {
- return &php_http_property_proxy_init(NULL, object, member, NULL TSRMLS_CC)->myself;
- }
-
- return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member, literal_key TSRMLS_CC);
+ zend_get_std_object_handlers()->write_property(object, member, value PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC);
}
-
PHP_METHOD(HttpClientDataShare, __destruct)
{
php_http_client_datashare_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
{
zval *client;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &client, php_http_client_class_entry)) {
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &client, php_http_client_get_class_entry())) {
php_http_client_datashare_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
RETURN_SUCCESS(php_http_client_datashare_attach(obj->share, client));
{
zval *client;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &client, php_http_client_class_entry)) {
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &client, php_http_client_get_class_entry())) {
php_http_client_datashare_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
RETURN_SUCCESS(php_http_client_datashare_detach(obj->share, client));
RETURN_FALSE;
}
+PHP_METHOD(HttpClientDataShare, __sleep)
+{
+ php_http_error(HE_THROW, PHP_HTTP_E_CLIENT_DATASHARE, "cannot serialize a client datashare");
+}
+
PHP_MINIT_FUNCTION(http_client_datashare)
{
- PHP_HTTP_REGISTER_CLASS(http\\Client\\DataShare, AbstractDataShare, http_client_datashare, php_http_object_class_entry, 0);
- php_http_client_datashare_class_entry->create_object = php_http_object_new;//php_http_client_datashare_object_new;
+ PHP_HTTP_REGISTER_CLASS(http\\Client\\DataShare, AbstractDataShare, http_client_datashare, php_http_object_get_class_entry(), ZEND_ACC_EXPLICIT_ABSTRACT_CLASS);
+ php_http_client_datashare_class_entry->create_object = php_http_client_datashare_object_new;
memcpy(&php_http_client_datashare_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
php_http_client_datashare_object_handlers.clone_obj = NULL;
+ php_http_client_datashare_object_handlers.read_property = php_http_client_datashare_object_read_prop;
php_http_client_datashare_object_handlers.write_property = php_http_client_datashare_object_write_prop;
- php_http_client_datashare_object_handlers.get_property_ptr_ptr = php_http_client_datashare_object_get_prop_ptr;
+ php_http_client_datashare_object_handlers.get_property_ptr_ptr = NULL;
zend_class_implements(php_http_client_datashare_class_entry TSRMLS_CC, 1, spl_ce_Countable);
projects / m6w6 / ext-http / blobdiff