From feab775de457917972ab8d2e47e12bded7f68872 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 21 Jan 2015 21:56:56 +0100 Subject: [PATCH] fix cainfo default configuration; fix array_merge --- php_http_client_curl.c | 2 +- php_http_misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php_http_client_curl.c b/php_http_client_curl.c index 6928945..9881301 100644 --- a/php_http_client_curl.c +++ b/php_http_client_curl.c @@ -1346,7 +1346,7 @@ static void php_http_curle_options_init(php_http_options_t *registry) opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR; #ifdef PHP_HTTP_CURL_CAINFO - ZVAL_STRING(&opt->defval, PHP_HTTP_CURL_CAINFO); + ZVAL_PSTRING(&opt->defval, PHP_HTTP_CURL_CAINFO); #endif } if ((opt = php_http_option_register(registry, ZEND_STRL("capath"), CURLOPT_CAPATH, IS_STRING))) { diff --git a/php_http_misc.c b/php_http_misc.c index ff0c024..1344726 100644 --- a/php_http_misc.c +++ b/php_http_misc.c @@ -226,7 +226,7 @@ int php_http_array_apply_merge_func(zval *value, int num_args, va_list args, zen convert_to_string_ex(value); } - Z_ADDREF_P(value); + Z_TRY_ADDREF_P(value); if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->key) { key = php_http_pretty_key(estrndup(hash_key->key->val, hash_key->key->len), hash_key->key->len, 1, 1); -- 2.30.2