From: Michael Wallner <mike@php.net>
Date: Tue, 7 Sep 2021 07:45:02 +0000 (+0200)
Subject: Merge branch 'curl-matrix': fix #116
X-Git-Tag: v4.2.1~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=f3b5b84017131e5354aacaa01836d317dad38686;hp=b6eeba772d69a317ee541c95c43bd0459444fec8;p=m6w6%2Fext-http

Merge branch 'curl-matrix': fix #116
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a59095..4851d4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,50 @@
 # ChangeLog v4
 
+## 4.2.0, 2021-08-30
+
+* Fixed PHP-8.1 compatibility (see gh issues #114, #115 and #118)
+* Fixed cookies failing with libcurl >= 7.77 (see gh issue #116)
+* Fixed tests using $_ENV instead of getenv() to find executables in PATH (see gh issue #113)
+* Added http\Env::reset(): resets internal HTTP request cache (see gh issue #90)
+
+## 4.1.0, 2021-04-21
+
+* Added request options:
+  * http\Client\Curl::$abstract_unix_socket
+  * http\Client\Curl::$altsvc
+  * http\Client\Curl::$altsvc_ctrl
+  * http\Client\Curl::$aws_sigv4
+  * http\Client\Curl::$doh_url
+  * http\Client\Curl::$dns_shuffle_addresses
+  * http\Client\Curl::$haproxy_protocol
+  * http\Client\Curl::$hsts
+  * http\Client\Curl::$hsts_ctrl
+  * http\Client\Curl::$http09_allowed
+  * http\Client\Curl::$maxage_conn
+  * http\Client\Curl::$pinned_publickey
+  * http\Client\Curl::$proxy_ssl
+  * http\Client\Curl::$socks5_auth
+  * http\Client\Curl::$tcp_fastopen
+  * http\Client\Curl::$tls13_ciphers
+  * http\Client\Curl::$xoauth2_bearer
+* Added request option constants:
+  * http\Client\Curl\AUTH_AWS_SIGV4
+  * http\Client\Curl\AUTH_BEARER
+  * http\Client\Curl\AUTH_NONE
+  * http\Client\Curl\HTTP_VERSION_2_PRIOR_KNOWLEDGE
+  * http\Client\Curl\HTTP_VERSION_3
+  * http\Client\Curl\SSL_VERSION_MAX_*
+  * http\Client\Curl\SSL_VERSION_TLSv1_3
+* Added library version constants:
+  * http\Client\Curl\Versions\BROTLI
+  * http\Client\Curl\Versions\CAINFO
+  * http\Client\Curl\Versions\CAPATH
+  * http\Client\Curl\Versions\HYPER
+  * http\Client\Curl\Versions\ICONV
+  * http\Client\Curl\Versions\NGHTTP2
+  * http\Client\Curl\Versions\QUIC
+  * http\Client\Curl\Versions\ZSTD
+ 
 ## 4.0.0, 2021-01-13
 
 Changes from beta1:
diff --git a/tests/client012.phpt b/tests/client012.phpt
index 0e72628..5dd1513 100644
--- a/tests/client012.phpt
+++ b/tests/client012.phpt
@@ -26,6 +26,8 @@ var_dump(
 
 $client->attach($observer = new class implements SplObserver { 
 	public $data = [];
+
+	#[ReturnTypeWillChange]
 	function update(SplSubject $client, $req = null, $progress = null) {
 		$ti = $client->getTransferInfo($req);
 		if (isset($ti->tls_session["internals"])) {