1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.4'

This commit is contained in:
George Wang
2025-09-06 12:50:25 -04:00
2 changed files with 3 additions and 3 deletions

View File

@@ -591,7 +591,7 @@ static int sapi_lsapi_activate(void)
static sapi_module_struct lsapi_sapi_module =
{
"litespeed",
"LiteSpeed V8.2",
"LiteSpeed V8.3",
php_lsapi_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */

View File

@@ -635,8 +635,8 @@ static inline int isPipe( int fd )
{
char achPeer[128];
socklen_t len = 128;
if (( getpeername( fd, (struct sockaddr *)achPeer, &len ) != 0 )&&
( errno == ENOTCONN ))
if ((getpeername(fd, (struct sockaddr *)achPeer, &len) != 0 )
&& (errno == ENOTCONN || errno == ENOTSOCK))
return 0;
else
return 1;