php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source
This commit is contained in:
Jakub Zelenka
2023-11-09 13:38:55 +00:00
parent 9717e9fd56 c6eeb83e1f
commit 42ea0ca3db
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.3.0
- Standard:
. Fix memory leak in syslog device handling. (danog)
09 Nov 2023, PHP 8.3.0RC6

10
ext/standard/basic_functions.c
View File

@@ -358,9 +358,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
@@ -417,9 +414,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)
@@ -469,9 +463,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;