From 145787367ace42a52a21bb91199f3af31532aca4 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 5 Feb 2024 20:36:16 +0100
Subject: [PATCH] prepare v4.2.5

* Fix incompatible pointer types (32-bit) (see gh issue #134)
* Fix glitch in CURL_VERSION_TLSAUTH_SRP autoconf probe (see gh issue #133)
---
 CHANGELOG.md | 13 +++++++++----
 package.xml  | 10 ++++------
 php_http.h   |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48f701d..47ec2a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,15 @@
 # ChangeLog v4
 
+## 4.2.5, 2024-02-05
+
+* Fix incompatible pointer types (32-bit) (see gh issue #134)
+* Fix glitch in CURL_VERSION_TLSAUTH_SRP autoconf probe (see gh issue #133)
+
 ## 4.2.4, 2023-10-02
 
 * Fix Error using ssl array in options : Could not set option tlsauthtype
   (see  gh issue #131)
-* Fix arginfo wargnings of the internal curl client user handler 
+* Fix arginfo wargnings of the internal curl client user handler
 * Disable libidn support for v1.36-v1.38 due to broken locale detection
 
 ## 4.2.3, 2022-06-10
@@ -19,7 +24,7 @@
 
 * Fixed failing tests with PHP-8.1 (see gh issue #120)
 * Fixed configure reliably finding the right libcurl features available
-* Fixed cookie handling with libcurl 7.77+ and consistently across all 
+* Fixed cookie handling with libcurl 7.77+ and consistently across all
   supported libcurl versions (follow-up to gh issue #116)
 
 ## 4.2.0, 2021-08-30
@@ -66,7 +71,7 @@
   * http\Client\Curl\Versions\NGHTTP2
   * http\Client\Curl\Versions\QUIC
   * http\Client\Curl\Versions\ZSTD
- 
+
 ## 4.0.0, 2021-01-13
 
 Changes from beta1:
@@ -76,7 +81,7 @@ Changes from beta1:
 ## 4.0.0beta1, 2020-09-23
 
 * PHP 8 compatibility
-	- Drop ext-propro support:  
+	- Drop ext-propro support:
 		PHP 8 removes the object get/set API from the ZendEngine, which renders
 		that extension dysfunctional. As a consequence, the header property of
 		http\Message and derived classes cannot be modified in place, and thus
diff --git a/package.xml b/package.xml
index f9e4832..5daf785 100644
--- a/package.xml
+++ b/package.xml
@@ -31,9 +31,9 @@ https://mdref.m6w6.name/http
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2023-10-02</date>
+ <date>2024-02-05</date>
  <version>
-  <release>4.2.4</release>
+  <release>4.2.5</release>
   <api>4.2.0</api>
  </version>
  <stability>
@@ -42,10 +42,8 @@ https://mdref.m6w6.name/http
  </stability>
  <license uri="http://copyfree.org/content/standard/licenses/2bsd/license.txt">BSD-2-Clause</license>
  <notes><![CDATA[
-* Fix Error using ssl array in options : Could not set option tlsauthtype
-  (see  gh issue #131)
-* Fix arginfo wargnings of the internal curl client user handler
-* Disable libidn support for v1.36-v1.38 due to broken locale detection
+* Fix incompatible pointer types (32-bit) (see gh issue #134)
+* Fix glitch in CURL_VERSION_TLSAUTH_SRP autoconf probe (see gh issue #133)
 ]]></notes>
  <contents>
   <dir name="/">
diff --git a/php_http.h b/php_http.h
index cfa1160..f8cede2 100644
--- a/php_http.h
+++ b/php_http.h
@@ -13,14 +13,14 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_PECL_HTTP_VERSION "4.2.4"
+#define PHP_PECL_HTTP_VERSION "4.2.5"
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
 
 extern int http_module_number;
 
-#endif	/* PHP_EXT_HTTP_H */
+#endif /* PHP_EXT_HTTP_H */
 
 /*
  * Local variables:
-- 
2.30.2