From a9d66b28b54ae97735f70067e5d1dd8bc469d77e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Thu, 2 Jul 2020 12:48:58 +0200 Subject: [PATCH] Prefix WORKER_STATUS_FD with WCF_ --- .../lib/system/cli/command/WorkerCLICommand.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php b/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php index 3e2789bb90..45df1ebb6e 100644 --- a/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php +++ b/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php @@ -141,8 +141,8 @@ class WorkerCLICommand implements IArgumentedCLICommand { ])); $progress = 0; $output = null; - if (!empty($_ENV['WORKER_STATUS_FD'])) { - $output = new File("php://fd/".$_ENV['WORKER_STATUS_FD'], "w"); + if (!empty($_ENV['WCF_WORKER_STATUS_FD'])) { + $output = new File("php://fd/".$_ENV['WCF_WORKER_STATUS_FD'], "w"); } for ($i = ($threadId !== null ? ($threadId + 1) : 0); $progress < 100; $i += $threads) { $worker->setLoopCount($i); @@ -200,12 +200,12 @@ class WorkerCLICommand implements IArgumentedCLICommand { // Reuse the environment. // - Specify TERM=dumb to prevent the worker from messing around with our terminal. - // - Specify WORKER_STATUS_FD to prevent the administrator from manually giving a threadId, + // - Specify WCF_WORKER_STATUS_FD to prevent the administrator from manually giving a threadId, // causing the worker to write into an arbitrary file descriptor (most likely the DB connection). // - Specify WCF_SESSION_ID to perform the login. $env = array_merge($_ENV, [ 'TERM' => 'dumb', - 'WORKER_STATUS_FD' => 3, + 'WCF_WORKER_STATUS_FD' => 3, 'WCF_SESSION_ID' => CLIWCF::getSession()->sessionID, ]); -- 2.20.1