[packages/php] Rel 2; improve curl error rerporting

[arekm]

commit 1518c74ab8e899438b3bd1b0087166139be8a84d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Aug 6 08:49:15 2024 +0200

    Rel 2; improve curl error rerporting

 curl.patch | 27 +++++++++++++++++++++++++++
 php.spec   |  6 +++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index 43f705f..943e2a8 100644
--- a/php.spec
+++ b/php.spec
@@ -142,7 +142,7 @@
 %define		ver_suffix	83
 %define		php_suffix	%{!?with_default_php:%{ver_suffix}}
 %define		subver		%{nil}
-%define		rel		1
+%define		rel		2
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -182,6 +182,8 @@ Patch5:		openssl.patch
 # https://github.com/php/php-src/issues/9910
 Patch6:		opcache-nokill-perm.patch
 Patch7:		%{orgname}-sapi-ini-file.patch
+Patch8:		curl.patch
+
 Patch10:	%{orgname}-ini.patch
 Patch11:	embed.patch
 Patch14:	%{orgname}-no_pear_install.patch
@@ -1880,6 +1882,8 @@ cp -p php.ini-production php.ini
 #%patch5 -p1 resolved upstream?
 %patch6 -p1
 %patch7 -p1 -b .sapi-ini-file
+%patch8 -p1
+
 %patch10 -p1 -b .ini
 %patch14 -p1
 %patch18 -p1
diff --git a/curl.patch b/curl.patch
new file mode 100644
index 0000000..5261f3a
--- /dev/null
+++ b/curl.patch
@@ -0,0 +1,27 @@
+commit efd00b8ff05cb78ecb0351b96cce7780bcb72a2a
+Author: David Carlier <devnexen at gmail.com>
+Date:   Tue Jul 16 19:55:04 2024 +0100
+
+    ext/curl: curl_error using curl_easy_strerror if CURLOPT_ERRORBUFFER
+    
+    did not fill the error buffer.
+    
+    close GH-14984
+
+diff --git a/ext/curl/interface.c b/ext/curl/interface.c
+index 707f4e0a6f..4884ddc822 100644
+--- a/ext/curl/interface.c
++++ b/ext/curl/interface.c
+@@ -2764,7 +2764,11 @@ PHP_FUNCTION(curl_error)
+ 
+ 	if (ch->err.no) {
+ 		ch->err.str[CURL_ERROR_SIZE] = 0;
+-		RETURN_STRING(ch->err.str);
++		if (strlen(ch->err.str) > 0) {
++			RETURN_STRING(ch->err.str);
++		} else {
++			RETURN_STRING(curl_easy_strerror(ch->err.no));
++		}
+ 	} else {
+ 		RETURN_EMPTY_STRING();
+ 	}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/1518c74ab8e899438b3bd1b0087166139be8a84d