Fix bug #67764: fpm: syslog.ident does not work

php · Jun 19, 2022 · e330f44 · e330f44
1 parent 651e0cc
commit e330f44
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/NEWS b/NEWS
@@ -16,6 +16,9 @@ PHP                                                                        NEWS
   . Fixed bug #78139 (timezone_open accepts invalid timezone string argument).
     (Derick)
 
+- FPM:
+  . Fixed bug #67764 (fpm: syslog.ident don't work). (Jakub Zelenka)
+
 - MBString:
   . Fixed bug GH-8685 (pcre not ready at mbstring startup). (Remi)
 

diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
@@ -120,11 +120,6 @@ PHP_MSHUTDOWN_FUNCTION(syslog)
 	return SUCCESS;
 }
 
-void php_openlog(const char *ident, int option, int facility)
-{
-	openlog(ident, option, facility);
-	PG(have_called_openlog) = 1;
-}
 
 /* {{{ Open connection to system logger */
 /*
@@ -161,7 +156,7 @@ PHP_FUNCTION(closelog)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	closelog();
+	php_closelog();
 	if (BG(syslog_device)) {
 		free(BG(syslog_device));
 		BG(syslog_device)=NULL;

diff --git a/main/php_syslog.c b/main/php_syslog.c
@@ -32,6 +32,18 @@
 #define syslog std_syslog
 #endif
 
+void php_openlog(const char *ident, int option, int facility)
+{
+	openlog(ident, option, facility);
+	PG(have_called_openlog) = 1;
+}
+
+void php_closelog()
+{
+	closelog();
+	PG(have_called_openlog) = 0;
+}
+
 #ifdef PHP_WIN32
 PHPAPI void php_syslog(int priority, const char *format, ...) /* {{{ */
 {

diff --git a/main/php_syslog.h b/main/php_syslog.h
@@ -37,6 +37,7 @@
 BEGIN_EXTERN_C()
 PHPAPI void php_syslog(int, const char *format, ...);
 PHPAPI void php_openlog(const char *, int, int);
+PHPAPI void php_closelog();
 END_EXTERN_C()
 
 #endif
diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c
@@ -88,7 +88,7 @@ int fpm_stdio_init_child(struct fpm_worker_pool_s *wp) /* {{{ */
 {
 #ifdef HAVE_SYSLOG_H
 	if (fpm_globals.error_log_fd == ZLOG_SYSLOG) {
-		closelog(); /* ensure to close syslog not to interrupt with PHP syslog code */
+		php_closelog(); /* ensure to close syslog not to interrupt with PHP syslog code */
 	} else
 #endif