Merge pull request #2796 from mapogolions/fix/http-message-format

Fix HTTP message format
slimphp · Aug 12, 2019 · fabf552 · fabf552
2 parents 88187e7 + f777a1a
commit fabf552
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Slim/ResponseEmitter.php b/Slim/ResponseEmitter.php
@@ -41,8 +41,8 @@ public function emit(ResponseInterface $response): void
                     ->withoutHeader('Content-Type')
                     ->withoutHeader('Content-Length');
             }
-            $this->emitHeaders($response);
             $this->emitStatusLine($response);
+            $this->emitHeaders($response);
         }
 
         if (!$isEmpty) {

diff --git a/tests/ResponseEmitterTest.php b/tests/ResponseEmitterTest.php
@@ -136,9 +136,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());
@@ -154,9 +154,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());