From 85c40246643afd06cacecc8e75025a299d336a70 Mon Sep 17 00:00:00 2001
From: Louis Chmn <louis@chmn.me>
Date: Sun, 20 Sep 2026 14:23:43 +0200
Subject: [PATCH] fix: Fix SUBURI init when treating several requests with a
 worker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Louis Chmn <louis@chmn.me>
---
 lib/OC.php | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/lib/OC.php b/lib/OC.php
index 5c58aee2091a8..5f5d9d6fe995e 100644
--- a/lib/OC.php
+++ b/lib/OC.php
@@ -52,11 +52,6 @@ class OC {
 	 * @psalm-suppress ImpureStaticProperty
 	 */
 	public static string $SERVERROOT = '';
-	/**
-	 * the current request path relative to the Nextcloud root (e.g. files/index.php)
-	 * @psalm-suppress ImpureStaticProperty
-	 */
-	private static string $SUBURI = '';
 	/**
 	 * the Nextcloud root path for http requests (e.g. /nextcloud)
 	 * @psalm-suppress ImpureStaticProperty
@@ -74,6 +69,11 @@ class OC {
 	 */
 	public static string $configDir;
 
+	/**
+	 * the current request path relative to the Nextcloud root (e.g. files/index.php)
+	 * @psalm-suppress ImpureStaticProperty
+	 */
+	private static string $SUBURI = '';
 	/**
 	 * requested app
 	 * @psalm-suppress ImpureStaticProperty
@@ -107,12 +107,12 @@ class OC {
 	 * @psalm-suppress ImpureStaticProperty
 	 */
 	private static bool $oneTimeChecksDone = false;
-
 	/**
-	 * @throws \RuntimeException when the 3rdparty directory is missing or
-	 *                           the app path list is empty or contains an invalid path
+	 * @psalm-suppress ImpureStaticProperty
 	 */
-	public static function initPaths(): void {
+	private static bool $firstRequest = true;
+
+	private static function initSubUri(): string {
 		OC::$SUBURI = str_replace('\\', '/', substr(realpath($_SERVER['SCRIPT_FILENAME'] ?? ''), strlen(OC::$SERVERROOT)));
 		/**
 		 * FIXME: The following lines are required because we can't yet instantiate
@@ -143,6 +143,15 @@ public static function initPaths(): void {
 				OC::$SUBURI = OC::$SUBURI . 'index.php';
 			}
 		}
+		return $scriptName;
+	}
+
+	/**
+	 * @throws \RuntimeException when the 3rdparty directory is missing or
+	 *                           the app path list is empty or contains an invalid path
+	 */
+	public static function initPaths(): void {
+		$scriptName = self::initSubUri();
 
 		if (OC::$CLI) {
 			OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
@@ -763,7 +772,12 @@ private static function oneTimeChecks(): void {
 	 * Called before each request served if the same worker serves several request
 	 */
 	public static function initForRequest(): void {
-		self::resetStaticProperties();
+		if (self::$firstRequest) {
+			self::$firstRequest = false;
+		} else {
+			self::resetStaticProperties();
+			self::initSubUri();
+		}
 
 		// First handle PHP configuration and copy auth headers to the expected
 		// $_SERVER variable before doing anything Server object related
@@ -1359,6 +1373,8 @@ protected static function tryAppAPILogin(OCP\IRequest $request): bool {
 	 */
 	private static function resetStaticProperties(): void {
 		// FIXME needed because these use a static var
+		self::$SUBURI = '';
+		self::$REQUESTEDAPP = '';
 		\OC_Hook::clear();
 		\OC_Util::$styles = [];
 		\OC_Util::$headers = [];