From e78dd7ade2ac5e617bc5f515a04d1e1d87bd53ee Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 30 Jan 2015 17:01:59 +0800 Subject: Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0"" This reverts commit 348be58f869359513436f8dae44692c4c235c9dd. --- ext/curl/multi.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'ext/curl/multi.c') diff --git a/ext/curl/multi.c b/ext/curl/multi.c index e3db38b207..adab5fa219 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -105,10 +105,6 @@ void _php_curl_multi_cleanup_list(void *data) /* {{{ */ return; } - if (Z_RES_P(z_ch)->ptr == NULL) { - return; - } - ch = zend_fetch_resource(z_ch, -1, le_curl_name, NULL, 1, le_curl); if (!ch) { return; @@ -345,11 +341,9 @@ void _php_curl_multi_close(zend_resource *rsrc) /* {{{ */ for (pz_ch = (zval *)zend_llist_get_first_ex(&mh->easyh, &pos); pz_ch; pz_ch = (zval *)zend_llist_get_next_ex(&mh->easyh, &pos)) { - /* ptr is NULL means it already be freed */ - if (Z_RES_P(pz_ch)->ptr) { - ch = (php_curl *) zend_fetch_resource(pz_ch, -1, le_curl_name, NULL, 1, le_curl); - _php_curl_verify_handlers(ch, 0); - } + + ch = (php_curl *) zend_fetch_resource(pz_ch, -1, le_curl_name, NULL, 1, le_curl); + _php_curl_verify_handlers(ch, 0); } curl_multi_cleanup(mh->multi); -- cgit v1.2.1