diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-15 17:08:01 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-15 17:08:01 +0100 |
| commit | 585f4cbb214add60fbd1c4136da215b8dd24c65a (patch) | |
| tree | be5e94e9689199d05e29f57fde8028460b46c01d | |
| parent | 2a04efe0e42c9d7ac150bc918e16edb96cf4f219 (diff) | |
| parent | 7899f6a9065197de9d6c3e31571fe5189d32a31b (diff) | |
| download | php-git-585f4cbb214add60fbd1c4136da215b8dd24c65a.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
| -rw-r--r-- | ext/curl/multi.c | 6 | ||||
| -rw-r--r-- | ext/phar/util.c | 5 |
2 files changed, 4 insertions, 7 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; diff --git a/ext/phar/util.c b/ext/phar/util.c index 80de3d7cd3..ff1f3f46db 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1829,9 +1829,9 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat return FAILURE; #endif case PHAR_SIG_OPENSSL: { - size_t siglen; unsigned char *sigbuf; #ifdef PHAR_HAVE_OPENSSL + unsigned int siglen; BIO *in; EVP_PKEY *key; EVP_MD_CTX *md_ctx; @@ -1878,7 +1878,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat } } - if (!EVP_SignFinal (md_ctx, sigbuf,(unsigned int *)&siglen, key)) { + if (!EVP_SignFinal (md_ctx, sigbuf, &siglen, key)) { efree(sigbuf); if (error) { spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname); @@ -1889,6 +1889,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat sigbuf[siglen] = '\0'; EVP_MD_CTX_destroy(md_ctx); #else + size_t siglen; sigbuf = NULL; siglen = 0; php_stream_seek(fp, 0, SEEK_END); |