mirror of
https://github.com/php/php-src.git
synced 2024-11-24 02:15:04 +08:00
Merge branch 'PHP-8.1'
This commit is contained in:
commit
305d5e12df
@ -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;
|
||||
|
@ -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, ...) /* {{{ */
|
||||
{
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user