php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source
This commit is contained in:
David Carlier
2024-07-18 06:26:22 +01:00
parent d3caedd6d2 efd00b8ff0
commit 383d1b0330
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -2,6 +2,10 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.3.11
- Curl:
. Fixed case when curl_error returns an empty string.
(David Carlier)
- Soap:
. Fixed bug #55639 (Digest autentication dont work). (nielsdos)

6
ext/curl/interface.c
View File

@@ -2869,7 +2869,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();
}