From: Michael Wallner <mike@php.net>
Date: Wed, 14 Sep 2016 06:07:59 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_RC1~30
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=c4f87eca8a03263a6506ae2ddc56f76b6b988c51;ds=sidebyside

Merge branch 'v2.6.x'
---

c4f87eca8a03263a6506ae2ddc56f76b6b988c51
diff --cc src/php_http_client_curl.c
index cf65353,b7c6b05..69b6ca7
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@@ -470,10 -447,14 +470,16 @@@ static ZEND_RESULT_CODE php_http_curle_
  #endif
  #if PHP_HTTP_CURL_VERSION(7,21,0)
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_LOCAL_PORT, &l)) {
 -		add_assoc_long_ex(&array, "local_port", sizeof("local_port"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "local_port", lenof("local_port"), &tmp);
  	}
  #endif
+ #if PHP_HTTP_CURL_VERSION(7,50,0)
+ 	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_HTTP_VERSION, &l)) {
 -		add_assoc_long_ex(&array, "http_version", sizeof("http_version"), l);
++		ZVAL_LONG(&tmp, l);
++		zend_hash_str_update(info, "http_version", lenof("http_version"), &tmp);
+ 	}
+ #endif
  
  	/* END::CURLINFO */