fix cainfo default configuration; fix array_merge

[m6w6/ext-http] / php_http_client_curl.c

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 6928945a4ab502ce20eca1661b68feca7fa16641..9881301c3dce2c62b75fe04358d69adcd71ee9ca 100644 (file)
--- 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))) {