mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-24 04:33:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

decrement ch->uses (or destroy handle) when destroying multi handle

Browse Source
This commit is contained in:
Antony Dovgal 2006-10-05 15:06:11 +00:00
parent e93802dc51
commit 9adc8c3931
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ext/curl/multi.c
View File

@ -62,7 +62,7 @@ PHP_FUNCTION(curl_multi_init)
mh = ecalloc(1, sizeof(php_curlm));
mh->multi = curl_multi_init();
zend_llist_init(&mh->easyh, sizeof(zval), (llist_dtor_func_t) NULL, 0);
zend_llist_init(&mh->easyh, sizeof(zval), _php_curl_multi_cleanup_list, 0);
ZEND_REGISTER_RESOURCE(return_value, mh, le_curl_multi_handle);
}
@ -98,6 +98,27 @@ PHP_FUNCTION(curl_multi_add_handle)
}
/* }}} */
void _php_curl_multi_cleanup_list(void *data) /* {{{ */
{
zval *z_ch = (zval *)data;
php_curl *ch;
if (!z_ch) {
return;
}
ch = (php_curl *) zend_fetch_resource(&z_ch TSRMLS_CC, -1, le_curl_name, NULL, 1, le_curl);
if (!ch) {
return;
}
if (ch->uses) {
ch->uses--;
} else {
zend_list_delete(Z_LVAL_P(z_ch));
}
}
/* }}} */
/* Used internally as comparison routine passed to zend_list_del_element */
static int curl_compare_resources( zval *z1, zval **z2 )

1
ext/curl/php_curl.h
View File

@ -138,6 +138,7 @@ typedef struct {
} php_curlm;
void _php_curl_cleanup_handle(php_curl *);
void _php_curl_multi_cleanup_list(void *data);
/* streams support */