commit cfa53e2d1ff5f109767981410fa1fa306069ba15 Author: Arkadiusz Miśkiewicz <ar...@maven.pl> Date: Fri Jul 19 11:29:18 2024 +0200
Improve curl errors a bit. curl.patch | 27 +++++++++++++++++++++++++++ php.spec | 6 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) --- diff --git a/php.spec b/php.spec index 922ac93..49ab89a 100644 --- a/php.spec +++ b/php.spec @@ -149,7 +149,7 @@ Summary(ru.UTF-8): PHP - язык препроцессирования HTML-фа Summary(uk.UTF-8): PHP - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} Version: 8.1.19 -Release: 6 +Release: 7 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -179,6 +179,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 @@ -1877,6 +1879,8 @@ cp -p php.ini-production php.ini %patch5 -p1 %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 <devne...@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/cfa53e2d1ff5f109767981410fa1fa306069ba15 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit