X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client_curl.c;h=44b2c21a9cc819a842e50cabcc23d6dbbb13c558;hp=df2bb11b6358a4408226268f8c91247900e6e1e2;hb=refs%2Fheads%2Fv2.3.x;hpb=2deab3ba28070e28822349a22a53abdf3a9509ea

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index df2bb11..44b2c21 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -934,6 +934,9 @@ static STATUS php_http_curle_option_set_compress(php_http_option_t *opt, zval *v
 	php_http_client_curl_handler_t *curl = userdata;
 	CURL *ch = curl->handle;
 
+#if !PHP_HTTP_CURL_VERSION(7,21,6)
+#	define CURLOPT_ACCEPT_ENCODING CURLOPT_ENCODING
+#endif
 	if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_ACCEPT_ENCODING, Z_BVAL_P(val) ? "" : NULL)) {
 		return FAILURE;
 	}
@@ -2341,7 +2344,8 @@ static int apply_available_options(void *pDest TSRMLS_DC, int num_args, va_list
 		if (Z_TYPE(opt->defval) == IS_STRING && !Z_STRVAL(opt->defval)) {
 			ZVAL_NULL(entry);
 		} else {
-			ZVAL_ZVAL(entry, &opt->defval, 1, 0);
+			ZVAL_COPY_VALUE(entry, &opt->defval);
+			zval_copy_ctor(entry);
 		}
 	}