diff --git a/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php b/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php index fd04f1fe4ca2f..a8871f803a1be 100644 --- a/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php +++ b/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php @@ -89,8 +89,10 @@ public function aroundDispatch( */ protected function addDebugHeaders(ResponseHttp $result) { - $cacheControl = $result->getHeader('Cache-Control')->getFieldValue(); - $this->addDebugHeader($result, 'X-Magento-Cache-Control', $cacheControl); + $cacheControlHeader = $result->getHeader('Cache-Control'); + if ($cacheControlHeader instanceof \Zend\Http\Header\HeaderInterface) { + $this->addDebugHeader($result, 'X-Magento-Cache-Control', $cacheControlHeader->getFieldValue()); + } $this->addDebugHeader($result, 'X-Magento-Cache-Debug', 'MISS', true); return $result; } diff --git a/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php b/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php index 022824faafbd4..f72a0e3bc46b3 100644 --- a/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php +++ b/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php @@ -73,8 +73,10 @@ public function aroundRenderResult( } if ($this->state->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) { - $cacheControl = $response->getHeader('Cache-Control')->getFieldValue(); - $response->setHeader('X-Magento-Cache-Control', $cacheControl); + $cacheControlHeader = $response->getHeader('Cache-Control'); + if ($cacheControlHeader instanceof \Zend\Http\Header\HeaderInterface) { + $response->setHeader('X-Magento-Cache-Control', $cacheControlHeader->getFieldValue()); + } $response->setHeader('X-Magento-Cache-Debug', 'MISS', true); }