Merge branch 'PHP-8.3'

* PHP-8.3:
  Fix GH-15565: --disable-ipv6 during compilation produces error EAI_SYSTEM not found
This commit is contained in:
Niels Dossche 2024-08-24 14:16:30 +02:00
commit a092bcb4d7
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 4 additions and 0 deletions

2
NEWS
View file

@ -14,6 +14,8 @@ PHP NEWS
(ilutov) (ilutov)
. Fixed bug GH-15501 (Windows HAVE_<header>_H macros defined to 1 or . Fixed bug GH-15501 (Windows HAVE_<header>_H macros defined to 1 or
undefined). (Peter Kokot) undefined). (Peter Kokot)
. Fixed bug GH-15565 (--disable-ipv6 during compilation produces error
EAI_SYSTEM not found). (nielsdos)
- Date: - Date:
. Fixed bug GH-13773 (DatePeriod not taking into account microseconds for end . Fixed bug GH-13773 (DatePeriod not taking into account microseconds for end

View file

@ -113,7 +113,9 @@ static const char *php_gai_strerror(int code)
{EAI_NONAME, "Name or service not known"}, {EAI_NONAME, "Name or service not known"},
{EAI_SERVICE, "Servname not supported for ai_socktype"}, {EAI_SERVICE, "Servname not supported for ai_socktype"},
{EAI_SOCKTYPE, "ai_socktype not supported"}, {EAI_SOCKTYPE, "ai_socktype not supported"},
# ifdef EAI_SYSTEM
{EAI_SYSTEM, "System error"}, {EAI_SYSTEM, "System error"},
# endif
{0, NULL} {0, NULL}
}; };
int i; int i;