archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove php_user_filter::$filter property

Browse source 
This property was formerly used to hold the php_stream_filter
pointer for destruction purposes. However, this is no longer used,
and we don't need to create this resource at all.
This commit is contained in:
Nikita Popov 2021-08-20 14:39:53 +02:00
parent 841d0b30eb
commit 7f7a90b2bc
1 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/standard/user_filters.c
View file

@ -33,7 +33,6 @@ struct php_user_filter_data {
}; };
/* to provide context for calling into the next filter from user-space */ /* to provide context for calling into the next filter from user-space */
static int le_userfilters;
static int le_bucket_brigade; static int le_bucket_brigade;
static int le_bucket; static int le_bucket;
@ -78,14 +77,6 @@ PHP_MINIT_FUNCTION(user_filters)
/* init the filter class ancestor */ /* init the filter class ancestor */
user_filter_class_entry = register_class_php_user_filter(); user_filter_class_entry = register_class_php_user_filter();
/* init the filter resource; it has no dtor, as streams will always clean it up
* at the correct time */
le_userfilters = zend_register_list_destructors_ex(NULL, NULL, PHP_STREAM_FILTER_RES_NAME, 0);
if (le_userfilters == FAILURE) {
return FAILURE;
}
/* Filters will dispose of their brigades */ /* Filters will dispose of their brigades */
le_bucket_brigade = zend_register_list_destructors_ex(NULL, NULL, PHP_STREAM_BRIGADE_RES_NAME, module_number); le_bucket_brigade = zend_register_list_destructors_ex(NULL, NULL, PHP_STREAM_BRIGADE_RES_NAME, module_number);
/* Brigades will dispose of their buckets */ /* Brigades will dispose of their buckets */
@ -255,7 +246,7 @@ static php_stream_filter *user_filter_factory_create(const char *filtername,
{ {
struct php_user_filter_data *fdat = NULL; struct php_user_filter_data *fdat = NULL;
php_stream_filter *filter; php_stream_filter *filter;
zval obj, zfilter; zval obj;
zval func_name; zval func_name;
zval retval; zval retval;
size_t len; size_t len;
@ -360,12 +351,7 @@ static php_stream_filter *user_filter_factory_create(const char *filtername,
zval_ptr_dtor(&retval); zval_ptr_dtor(&retval);
} }
/* set the filter property, this will be used during cleanup */
ZVAL_RES(&zfilter, zend_register_resource(filter, le_userfilters));
ZVAL_OBJ(&filter->abstract, Z_OBJ(obj)); ZVAL_OBJ(&filter->abstract, Z_OBJ(obj));
add_property_zval(&obj, "filter", &zfilter);
/* add_property_zval increments the refcount which is unwanted here */
zval_ptr_dtor(&zfilter);
return filter; return filter;
} }