X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=26b4b0992cccd8db395c8cb3e772823b4c5d8ca8;hb=df2638b79da782a9d3a927fcdd426d0067e33c6b;hp=85144807f1b6a9e489eb2c7b9d9cbad529059c1b;hpb=1041b48ef546c1a99f9a94210c19bcab364673cd;p=m6w6%2Fext-http

diff --git a/http_request_api.c b/http_request_api.c
index 8514480..26b4b09 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -471,12 +471,16 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 				zval **header_val;
 				if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &header_val, &pos)) {
 					char header[1024] = {0};
+					zval val;
 					
-					SEPARATE_ZVAL(header_val);
-					convert_to_string(*header_val);
+					val = **header_val;
+					zval_copy_ctor(&val);
+					INIT_PZVAL(&val);
+					convert_to_string(&val);
 					
-					snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
+					snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL(val));
 					request->_cache.headers = curl_slist_append(request->_cache.headers, header);
+					zval_dtor(&val);
 				}
 
 				/* reset */
@@ -501,13 +505,16 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 			if (cookie_key) {
 				zval **cookie_val;
 				if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) {
-					zval *cpy, *val = convert_to_type_ex(IS_STRING, *cookie_val, &cpy);
+					zval val;
 					
-					phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL_P(val));
+					val = **cookie_val;
+					INIT_PZVAL(&val);
+					zval_copy_ctor(&val);
+					convert_to_string(&val);
 					
-					if (cpy) {
-						zval_ptr_dtor(&cpy);
-					}
+					phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL(val));
+					
+					zval_dtor(&val);
 				}
 
 				/* reset */