[PHP-CVS] [php-src] master: Merge branch 'PHP-8.5'

Author: Go Kudo (zeriyoshi)
Date: 2026-08-15T01:04:12+09:00

Commit: https://github.com/php/php-src/commit/74fefd7aca5397ee66f3548c5ecb610593f938df
Raw diff: https://github.com/php/php-src/commit/74fefd7aca5397ee66f3548c5ecb610593f938df.diff

Merge branch 'PHP-8.5'

* PHP-8.5:
  [ci skip] update NEWS
  sapi/lsapi: fix returns uninitialized value (#23281)

Changed paths:
  M  sapi/litespeed/lsapi_main.c


Diff:

diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index e7aec268489b..2acbd432ee84 100644
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@ -1443,7 +1443,7 @@ void setArgv0( int argc, char * argv[] )
 #include <fcntl.h>
 int main( int argc, char * argv[] )
 {
-    int ret;
+    int ret = 0;
     int bindFd;
 
     char * php_ini_path = NULL;