diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-15 17:08:08 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-15 17:08:08 +0100 |
commit | 0f4b70d571a1703177afb23e1beb7e03942ccb3e (patch) | |
tree | 95d31edd09c60ec41ac167cf706d03ed16953402 | |
parent | a7ac26eaced694f5b2b68226b524a1de140f4f96 (diff) | |
parent | 585f4cbb214add60fbd1c4136da215b8dd24c65a (diff) | |
download | php-git-0f4b70d571a1703177afb23e1beb7e03942ccb3e.tar.gz |
Merge branch 'PHP-7.4'
-rw-r--r-- | ext/curl/multi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/curl/multi.c b/ext/curl/multi.c index ade9125dd1..473866f551 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -419,6 +419,7 @@ void _php_curl_multi_close(zend_resource *rsrc) /* {{{ */ curl_multi_cleanup(mh->multi); zend_llist_clean(&mh->easyh); if (mh->handlers->server_push) { + zval_ptr_dtor(&mh->handlers->server_push->func_name); efree(mh->handlers->server_push); } if (mh->handlers) { @@ -576,11 +577,6 @@ static int _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue, ZVAL_COPY(&mh->handlers->server_push->func_name, zvalue); mh->handlers->server_push->method = PHP_CURL_USER; - if (!Z_ISUNDEF(mh->handlers->server_push->func_name)) { - zval_ptr_dtor(&mh->handlers->server_push->func_name); - mh->handlers->server_push->fci_cache = empty_fcall_info_cache; - - } error = curl_multi_setopt(mh->multi, option, _php_server_push_callback); if (error != CURLM_OK) { return 0; |