archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1' into PHP-8.2

Browse source
This commit is contained in:
Jakub Zelenka 2023-11-09 13:32:33 +00:00
commit c6eeb83e1f
No known key found for this signature in database
GPG key ID: 1C0779DC5C0A9DE4
4 changed files with 4 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -2,6 +2,8 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.2.14
- Standard:
. Fix memory leak in syslog device handling. (danog)
23 Nov 2023, PHP 8.2.13

10
ext/standard/basic_functions.c
View file

@ -366,9 +366,6 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
{
#ifdef HAVE_SYSLOG_H
PHP_MSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
#ifdef ZTS
ts_free_id(basic_globals_id);
#ifdef PHP_WIN32
@ -425,9 +422,6 @@ PHP_RINIT_FUNCTION(basic) /* {{{ */
BG(user_shutdown_function_names) = NULL;
PHP_RINIT(filestat)(INIT_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
BASIC_RINIT_SUBMODULE(syslog)
#endif
BASIC_RINIT_SUBMODULE(dir)
BASIC_RINIT_SUBMODULE(url_scanner_ex)
@ -477,9 +471,7 @@ PHP_RSHUTDOWN_FUNCTION(basic) /* {{{ */
PHP_RSHUTDOWN(filestat)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
#ifdef PHP_WIN32
BASIC_RSHUTDOWN_SUBMODULE(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
BASIC_RSHUTDOWN_SUBMODULE(syslog);
#endif
BASIC_RSHUTDOWN_SUBMODULE(assert)
BASIC_RSHUTDOWN_SUBMODULE(url_scanner_ex)

4
ext/standard/php_ext_syslog.h
View file

@ -22,11 +22,7 @@
#include "php_syslog.h"
PHP_MINIT_FUNCTION(syslog);
PHP_RINIT_FUNCTION(syslog);
#ifdef PHP_WIN32
PHP_RSHUTDOWN_FUNCTION(syslog);
#endif
PHP_MSHUTDOWN_FUNCTION(syslog);
#endif

16
ext/standard/syslog.c
View file

@ -41,23 +41,9 @@ PHP_MINIT_FUNCTION(syslog)
}
/* }}} */
PHP_RINIT_FUNCTION(syslog)
{
BG(syslog_device) = NULL;
return SUCCESS;
}
#ifdef PHP_WIN32
PHP_RSHUTDOWN_FUNCTION(syslog)
{
closelog();
return SUCCESS;
}
#endif
PHP_MSHUTDOWN_FUNCTION(syslog)
{
php_closelog();
if (BG(syslog_device)) {
free(BG(syslog_device));
BG(syslog_device) = NULL;