archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source
This commit is contained in:
David Carlier 2024-07-18 06:26:54 +01:00
commit 223683dfb5
No known key found for this signature in database
GPG key ID: D308BD11AB42D054
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/curl/interface.c
View file

@ -2626,7 +2626,11 @@ PHP_FUNCTION(curl_error)
if (ch->err.no) { if (ch->err.no) {
ch->err.str[CURL_ERROR_SIZE] = 0; 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 { } else {
RETURN_EMPTY_STRING(); RETURN_EMPTY_STRING();
} }