From 4870e2eb50a8ad362c5875abd6739a5e5a3ca3a8 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Sun, 7 Jun 2026 23:31:17 +0100 Subject: [PATCH] fix(http): flatten PSR-7 request headers before forwarding to executor UsageTest::testCustomDomainsFunctionStats hit a 500: the function/site execution proxy forwards $request->getHeaders() to the executor as a {name: value} string map, but rc5's getHeaders() returns each header as a PSR-7 list of values. The array-valued headers broke the multipart executor request. Collapse them to single-line strings at the boundary. Co-Authored-By: Claude Opus 4.8 (1M context) --- app/controllers/general.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index 8bed6c8e03..94caf4760d 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -293,7 +293,12 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S $body = $swooleRequest->getContent() ?: ''; $method = $swooleRequest->server['request_method']; - $requestHeaders = $request->getHeaders(); + // getHeaders() follows PSR-7 and returns each header as a list of values; + // collapse to single-line strings for the function/site header map below. + $requestHeaders = \array_map( + static fn (array $values) => \implode(', ', $values), + $request->getHeaders() + ); if ($resource->isEmpty() || !$resource->getAttribute('enabled')) { if ($type === 'function') { @@ -400,8 +405,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S $headersFiltered = []; foreach ($headers as $key => $value) { if (\in_array(\strtolower($key), FUNCTION_ALLOWLIST_HEADERS_REQUEST)) { - // Request headers follow PSR-7 and arrive as a list of values; collapse to a single line. - $headersFiltered[] = ['name' => $key, 'value' => \is_array($value) ? \implode(', ', $value) : $value]; + $headersFiltered[] = ['name' => $key, 'value' => $value]; } }