Skip to content

Fix: header override #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Meldiron merged 2 commits into from
Sep 7, 2025
Merged

Fix: header override #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
190d2d2
Fix header override
Meldiron Sep 7, 2025
f055a71
Fix header case sensitivity
Meldiron Sep 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions src/Response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,9 +540,15 @@ public function enablePayload(): static
*
* @param string $key
* @param string $value
* @param bool $override
*/
public function addHeader(string $key, string $value): static
public function addHeader(string $key, string $value, bool $override = false): static
{
if ($override) {
$this->headers[$key] = $value;
return $this;
}

if (\array_key_exists($key, $this->headers)) {
if (\is_array($this->headers[$key])) {
$this->headers[$key][] = $value;
Expand Down Expand Up @@ -659,13 +665,21 @@ public function send(string $body = ''): void
}

$serverHeader = $this->headers['Server'] ?? 'Utopia/Http';
$this->addHeader('Server', $serverHeader);
$this->addHeader('Server', $serverHeader, override: true);

$this->appendCookies();

$hasContentEncoding = false;
foreach ($this->headers as $name => $values) {
if (\strtolower($name) === 'content-encoding') {
$hasContentEncoding = true;
break;
}
}

// Compress body only if all conditions are met:
if (
empty($this->headers['content-encoding']) &&
!$hasContentEncoding &&
!empty($this->acceptEncoding) &&
$this->isCompressible($this->contentType) &&
strlen($body) > $this->compressionMinSize
Expand All @@ -674,14 +688,14 @@ public function send(string $body = ''): void

if ($algorithm) {
$body = $algorithm->compress($body);
$this->addHeader('Content-Length', (string) \strlen($body));
$this->addHeader('Content-Encoding', $algorithm->getContentEncoding());
$this->addHeader('X-Utopia-Compression', 'true');
$this->addHeader('Vary', 'Accept-Encoding');
$this->addHeader('Content-Length', (string) \strlen($body), override: true);
$this->addHeader('Content-Encoding', $algorithm->getContentEncoding(), override: true);
$this->addHeader('X-Utopia-Compression', 'true', override: true);
$this->addHeader('Vary', 'Accept-Encoding', override: true);
}
}

$this->addHeader('X-Debug-Speed', (string) (microtime(true) - $this->startTime));
$this->addHeader('X-Debug-Speed', (string) (microtime(true) - $this->startTime), override: true);
$this->appendHeaders();

// Send response
Expand Down Expand Up @@ -769,7 +783,7 @@ public function chunk(string $body = '', bool $end = false): void
$this->sent = true;
}

$this->addHeader('X-Debug-Speed', (string) (microtime(true) - $this->startTime));
$this->addHeader('X-Debug-Speed', (string) (microtime(true) - $this->startTime), override: true);

$this
->appendCookies()
Expand Down Expand Up @@ -799,7 +813,7 @@ protected function appendHeaders(): static

// Send content type header
if (!empty($this->contentType)) {
$this->addHeader('Content-Type', $this->contentType);
$this->addHeader('Content-Type', $this->contentType, override: true);
}

// Set application headers
Expand Down Expand Up @@ -908,7 +922,7 @@ public function redirect(string $url, int $statusCode = 301): void
}

$this
->addHeader('Location', $url)
->addHeader('Location', $url, override: true)
->setStatusCode($statusCode)
->send('');
}
Expand Down
5 changes: 5 additions & 0 deletions tests/e2e/ResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,10 @@ public function testSetCookie()
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals('value1', $response['cookies']['key1']);
$this->assertEquals('value2', $response['cookies']['key2']);

$response = $this->client->call(Client::METHOD_GET, '/set-cookie-override');
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertArrayNotHasKey('key1', $response['cookies']);
$this->assertEquals('value2', $response['cookies']['key2']);
}
}
9 changes: 9 additions & 0 deletions tests/e2e/server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@
$response->send('OK');
});

App::get('/set-cookie-override')
->inject('request')
->inject('response')
->action(function (Request $request, Response $response) {
$response->addHeader('Set-Cookie', 'key1=value1', override: true);
$response->addHeader('Set-Cookie', 'key2=value2', override: true);
$response->send('OK');
});

App::get('/chunked')
->inject('response')
->action(function (Response $response) {
Expand Down