From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 2 Jul 2020 10:48:58 +0000 (+0200)
Subject: Prefix WORKER_STATUS_FD with WCF_
X-Git-Tag: 5.3.0_Alpha_1~161^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a9d66b28b54ae97735f70067e5d1dd8bc469d77e;p=GitHub%2FWoltLab%2FWCF.git

Prefix WORKER_STATUS_FD with WCF_
---

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,
 		]);