Merge branch 'PHP-8.5' into PHP-8.6

* PHP-8.5:
  Fix phpGH-24308: Preserve syslog handles not opened by PHP (php#24310)

Author: LamentXU123

NEWS

@@ -17,6 +17,10 @@ PHP                                                                        NEWS
   . Fixed infinite loop in sapi_header_op() for headers of 4 GiB or more.
     (Martin Mirchev)
 
+- Standard:
+  . Fixed bug GH-24308 (Request shutdown calls closelog() even when syslog
+    was not opened by PHP). (lazerg)
+
 - Streams:
   . Fixed bug GH-24506 (stream_select() leaks a stream-error operation level
     on its FD_SETSIZE failure path). (azjezz)

ext/standard/syslog.c

@@ -39,7 +39,9 @@ PHP_MINIT_FUNCTION(syslog)
 
 PHP_RSHUTDOWN_FUNCTION(syslog)
 {
-	php_closelog();
+	if (PG(have_called_openlog)) {
+		php_closelog();
+	}
 	if (BG(syslog_device)) {
 		free(BG(syslog_device));
 		BG(syslog_device) = NULL;
@@ -100,6 +102,9 @@ PHP_FUNCTION(syslog)
 		Z_PARAM_STR(message)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (!PG(have_called_openlog)) {
+		php_openlog(PG(syslog_ident), 0, PG(syslog_facility));
+	}
 	php_syslog_str(priority, message);
 	RETURN_TRUE;
 }

ext/standard/tests/network/gh24308.phpt

@@ -0,0 +1,44 @@
+--TEST--
+GH-24308 (syslog() without openlog() is closed at request end)
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY !== 'Linux') die('skip Linux only');
+if (!@is_dir('/proc/self/fd')) die('skip requires /proc/self/fd');
+if (!@stream_socket_client('udg:///dev/log')) die('skip requires /dev/log');
+?>
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+function sockets() {
+    $sockets = [];
+    foreach (scandir('/proc/self/fd') as $fd) {
+        $link = @readlink("/proc/self/fd/$fd");
+        if ($link !== false && str_starts_with($link, 'socket:')) {
+            $sockets[$fd] = $link;
+        }
+    }
+    return $sockets;
+}
+
+if (isset($_GET['syslog'])) {
+    $before = sockets();
+    syslog(LOG_DEBUG, 'GH-24308');
+    echo json_encode(array_diff_assoc(sockets(), $before));
+} else {
+    echo json_encode(sockets());
+}
+CODE;
+
+include __DIR__."/../../../../sapi/cli/tests/php_cli_server.inc";
+php_cli_server_start($serverCode, null, []);
+
+$opened = json_decode(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/?syslog"), true);
+var_dump(count($opened));
+
+$next = json_decode(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/"), true);
+var_dump(array_intersect_assoc($opened, $next));
+?>
+--EXPECT--
+int(1)
+array(0) {
+}