Skip to content

Commit ecd5c9b

Browse files
committed
MC-13825: [2.4.x] Migrate ZF2 components to Laminas
-- fix merge conflict
1 parent 05dd4b1 commit ecd5c9b

File tree

1 file changed

+0
-28
lines changed
  • lib/internal/Magento/Framework/HTTP/PhpEnvironment

1 file changed

+0
-28
lines changed

lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ class Response extends \Laminas\Http\PhpEnvironment\Response implements \Magento
1919
*/
2020
protected $isRedirect = false;
2121

22-
/**
23-
* @var bool
24-
*/
25-
private $headersSent;
26-
2722
/**
2823
* @inheritdoc
2924
*/
@@ -192,27 +187,4 @@ public function __sleep()
192187
{
193188
return ['content', 'isRedirect', 'statusCode'];
194189
}
195-
196-
/**
197-
* Sending provided headers.
198-
*
199-
* Had to be overridden because the original did not work correctly with multi-headers.
200-
*/
201-
public function sendHeaders()
202-
{
203-
if ($this->headersSent()) {
204-
return $this;
205-
}
206-
207-
$status = $this->renderStatusLine();
208-
header($status);
209-
210-
/** @var \Laminas\Http\Header\HeaderInterface $header */
211-
foreach ($this->getHeaders() as $header) {
212-
header($header->toString(), false);
213-
}
214-
215-
$this->headersSent = true;
216-
return $this;
217-
}
218190
}

0 commit comments

Comments
 (0)