Skip to content

Fixed #1730 (reintroduced in 4.x) #3139

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
l0gicgate merged 2 commits into from
Jan 13, 2022
Merged

Fixed #1730 (reintroduced in 4.x) #3139

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
740d7fe
Fixed #1730 (reintroduced in 4.x)
adoy Jan 10, 2022
85cf515
Merge branch '4.x' into fix-1739
l0gicgate Jan 13, 2022
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
6 changes: 5 additions & 1 deletion Slim/ResponseEmitter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@ public function emit(ResponseInterface $response): void
{
$isEmpty = $this->isResponseEmpty($response);
if (headers_sent() === false) {
$this->emitStatusLine($response);
$this->emitHeaders($response);

// Set the status _after_ the headers, because of PHP's "helpful" behavior with location headers.
// See https://github.com/slimphp/Slim/issues/1730

$this->emitStatusLine($response);
}

if (!$isEmpty) {
Expand Down
4 changes: 2 additions & 2 deletions tests/ResponseEmitterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ public function testResponseReplacesPreviouslySetHeaders()
$responseEmitter->emit($response);

$expectedStack = [
['header' => 'HTTP/1.1 200 OK', 'replace' => true, 'status_code' => 200],
['header' => 'X-Foo: baz1', 'replace' => true, 'status_code' => null],
['header' => 'X-Foo: baz2', 'replace' => false, 'status_code' => null],
['header' => 'HTTP/1.1 200 OK', 'replace' => true, 'status_code' => 200],
];

$this->assertSame($expectedStack, HeaderStack::stack());
Expand All @@ -162,9 +162,9 @@ public function testResponseDoesNotReplacePreviouslySetSetCookieHeaders()
$responseEmitter->emit($response);

$expectedStack = [
['header' => 'HTTP/1.1 200 OK', 'replace' => true, 'status_code' => 200],
['header' => 'set-cOOkie: foo=bar', 'replace' => false, 'status_code' => null],
['header' => 'set-cOOkie: bar=baz', 'replace' => false, 'status_code' => null],
['header' => 'HTTP/1.1 200 OK', 'replace' => true, 'status_code' => 200],
];

$this->assertSame($expectedStack, HeaderStack::stack());
Expand Down