Merge branch 'PHP-8.1' into PHP-8.2

bukka · bukka · commit bf250e9f8882 · 2023-11-16T14:36:16.000Z
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -229,6 +229,8 @@ static void basic_globals_ctor(php_basic_globals *basic_globals_p) /* {{{ */
 
 	BG(page_uid) = -1;
 	BG(page_gid) = -1;
+
+	BG(syslog_device) = NULL;
 }
 /* }}} */
 
diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
@@ -35,8 +35,6 @@
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(syslog)
 {
-	BG(syslog_device)=NULL;
-
 	return SUCCESS;
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,8 @@ static void basic_globals_ctor(php_basic_globals basic_globals_p) / {{{ */`
`229`	`229`
`230`	`230`	`BG(page_uid) = -1;`
`231`	`231`	`BG(page_gid) = -1;`
	`232`	`+`
	`233`	`+ BG(syslog_device) = NULL;`
`232`	`234`	`}`
`233`	`235`	`/* }}} */`
`234`	`236`