Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix GH-15565: --disable-ipv6 during compilation produces error EAI_SYSTEM not found
This commit is contained in:
Niels Dossche 2024-08-24 14:14:57 +02:00
commit 8da94cfc41
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

@ -7,6 +7,8 @@ PHP NEWS
(zeriyoshi) (zeriyoshi)
. Fixed bug GH-15515 (Configure error grep illegal option q). (Peter Kokot) . Fixed bug GH-15515 (Configure error grep illegal option q). (Peter Kokot)
. Fixed bug GH-15514 (Configure error: genif.sh: syntax error). (Peter Kokot) . Fixed bug GH-15514 (Configure error: genif.sh: syntax error). (Peter Kokot)
. Fixed bug GH-15565 (--disable-ipv6 during compilation produces error
EAI_SYSTEM not found). (nielsdos)
- DOM: - DOM:
. Fixed bug GH-15551 (Segmentation fault (access null pointer) in . Fixed bug GH-15551 (Segmentation fault (access null pointer) in

View file

@ -118,7 +118,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;