xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'less-leaks' into 'master'

Browse Source 
cleanup environment variables related to global configuration after instantiating config object

See merge request tt-rss/tt-rss!118
This commit is contained in:
Andrew Dolgov
2025-04-08 11:16:22 +00:00
parent 008c518d5d e4f1480453
commit 44e23469a0
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.docker/app/startup.sh
View File

@@ -156,6 +156,8 @@ find ${SCRIPT_ROOT}/sql/post-init.d/ -type f -name '*.sql' | while read F; do
$PSQL -f $F
done
unset PGPASSWORD
touch $DST_DIR/.app_is_ready
exec /usr/sbin/php-fpm${PHP_SUFFIX} --nodaemonize --force-stderr

10
classes/Config.php
View File

@@ -285,6 +285,11 @@ class Config {
if (isset(self::_DEFAULTS[$const])) {
$override = getenv(self::_ENVVAR_PREFIX . $const);
// cleanup original env var after importing
putenv(self::_ENVVAR_PREFIX . $const . '=');
unset($_ENV[self::_ENVVAR_PREFIX . $const]);
unset($_SERVER[self::_ENVVAR_PREFIX . $const]);
list ($defval, $deftype) = self::_DEFAULTS[$const];
$this->params[$cvalue] = [ self::cast_to($override !== false ? $override : $defval, $deftype), $deftype ];
@@ -443,6 +448,11 @@ class Config {
private function _add(string $param, string $default, int $type_hint): void {
$override = getenv(self::_ENVVAR_PREFIX . $param);
// cleanup original env var after importing
putenv(self::_ENVVAR_PREFIX . $param . '=');
unset($_ENV[self::_ENVVAR_PREFIX . $param]);
unset($_SERVER[self::_ENVVAR_PREFIX . $param]);
$this->params[$param] = [ self::cast_to($override !== false ? $override : $default, $type_hint), $type_hint ];
}