diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-30 17:01:59 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-30 17:01:59 +0800 |
| commit | e78dd7ade2ac5e617bc5f515a04d1e1d87bd53ee (patch) | |
| tree | 77019cc97f850f742574ced76976edeb39a1ae56 /ext/curl/multi.c | |
| parent | d28af7394acfd9d01ad4534744ab5e9250842f10 (diff) | |
| download | php-git-e78dd7ade2ac5e617bc5f515a04d1e1d87bd53ee.tar.gz | |
Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0""
This reverts commit 348be58f869359513436f8dae44692c4c235c9dd.
Diffstat (limited to 'ext/curl/multi.c')
| -rw-r--r-- | ext/curl/multi.c | 12 |
1 files changed, 3 insertions, 9 deletions
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); |
