Merge branch 'PHP-8.1' into PHP-8.2

Author: devnexen

NEWS

@@ -64,6 +64,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-10623 (Reflection::getClosureUsedVariables opcode fix with
     variadic arguments). (nielsdos)
 
+- Session:
+  . Fixed ps_files_cleanup_dir() on failure code paths with -1 instead of 0 as
+    the latter was considered success by callers. (nielsdos).
+
 - Standard:
   . Fixed bug GH-8086 (Introduce mail.mixed_lf_and_crlf INI). (Jakub Zelenka)
   . Fixed bug GH-10292 (Made the default value of the first param of srand() and

ext/session/mod_files.c

@@ -288,15 +288,15 @@ static int ps_files_cleanup_dir(const zend_string *dirname, zend_long maxlifetim
 	dir = opendir(ZSTR_VAL(dirname));
 	if (!dir) {
 		php_error_docref(NULL, E_NOTICE, "ps_files_cleanup_dir: opendir(%s) failed: %s (%d)", ZSTR_VAL(dirname), strerror(errno), errno);
-		return (0);
+		return -1;
 	}
 
 	time(&now);
 
 	if (ZSTR_LEN(dirname) >= MAXPATHLEN) {
 		php_error_docref(NULL, E_NOTICE, "ps_files_cleanup_dir: dirname(%s) is too long", ZSTR_VAL(dirname));
 		closedir(dir);
-		return (0);
+		return -1;
 	}
 
 	/* Prepare buffer (dirname never changes) */