clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jakub Zelenka 2022-06-12 22:32:48 +01:00
parent 651e0cc187
commit e330f443c9
No known key found for this signature in database
GPG Key ID: 1C0779DC5C0A9DE4
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -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)

7
ext/standard/syslog.c
View File

@ -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;

12
main/php_syslog.c
View File

@ -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, ...) /* {{{ */
{

1
main/php_syslog.h
View File

@ -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

2
sapi/fpm/fpm/fpm_stdio.c
View File

@ -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