From 991c404d93eea8175a79de8a7536c00fa5c32f2b Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Thu, 9 Jun 2022 11:07:37 +0200
Subject: [PATCH] changelog

---
 CHANGELOG.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 package.xml  | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b76f56d..d113f31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,53 @@
 # ChangeLog v3
 
+## 3.3.0, 2022-MM-DD
+
+* Fix http\Client::requeue() not updating response callback
+* Backport bug fixes and features from v4:
+  * Fixed configure reliably finding the right libcurl features available
+  * Fixed cookie handling with libcurl 7.77+ and consistently across all 
+    supported libcurl versions (follow-up to gh issue #116)
+  * 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)
+  * Fixed configure on systems which do not provide icu-config
+  * Fixed gh-issue #89: Cookie handling cannot be disabled since v3.2.1
+  * Added http\Env::reset(): resets internal HTTP request cache (see gh issue #90)
+  * 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
+
 ## 3.2.5, 2022-02-25
 
 * Fixed gh-issue #123: Segfault with libcurl 7.81
diff --git a/package.xml b/package.xml
index 0576cf2..321efde 100644
--- a/package.xml
+++ b/package.xml
@@ -42,7 +42,51 @@ https://mdref.m6w6.name/http
  </stability>
  <license uri="http://copyfree.org/content/standard/licenses/2bsd/license.txt">BSD-2-Clause</license>
  <notes><![CDATA[
-  * Backport features and bug fixes from v4.
+* Fix http\Client::requeue() not updating response callback
+* Backport bug fixes and features from v4:
+  * Fixed configure reliably finding the right libcurl features available
+  * Fixed cookie handling with libcurl 7.77+ and consistently across all
+    supported libcurl versions (follow-up to gh issue #116)
+  * 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)
+  * Fixed configure on systems which do not provide icu-config
+  * Fixed gh-issue #89: Cookie handling cannot be disabled since v3.2.1
+  * Added http\Env::reset(): resets internal HTTP request cache (see gh issue #90)
+  * 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
 ]]></notes>
  <contents>
   <dir name="/">
-- 
2.30.2