diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-15 17:07:48 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-15 17:07:48 +0100 |
| commit | 7899f6a9065197de9d6c3e31571fe5189d32a31b (patch) | |
| tree | b08234a0fb0361db825efe8b5e8bf92dd16b98ee | |
| parent | b41959089313d7397c936a885e9d1ca84e0f93f8 (diff) | |
| parent | 97f9fd6949a52d1eb30c3e1c90f0789b57c29468 (diff) | |
| download | php-git-7899f6a9065197de9d6c3e31571fe5189d32a31b.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -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 1dd3122dcc..e2ac608483 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -420,6 +420,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) { @@ -577,11 +578,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; |