Merge branch 'PHP-8.1'

This commit is contained in:
Jakub Zelenka 2022-06-19 20:10:06 +01:00
commit 305d5e12df
No known key found for this signature in database
GPG Key ID: 1C0779DC5C0A9DE4
4 changed files with 15 additions and 7 deletions

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;

View File

@ -71,6 +71,18 @@ PHPAPI void php_syslog_str(int priority, const zend_string* message)
smart_string_free(&sbuf);
}
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, ...) /* {{{ */
{

View File

@ -38,6 +38,7 @@ BEGIN_EXTERN_C()
PHPAPI void php_syslog_str(int priority, const zend_string* message);
PHPAPI void php_syslog(int, const char *format, ...);
PHPAPI void php_openlog(const char *, int, int);
PHPAPI void php_closelog();
END_EXTERN_C()
#endif

View File

@ -89,7 +89,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