Issue #2603788 by Wim Leers, dawehner: HtmlResponseSubscriber does not call...

Issue #2603788 by Wim Leers, dawehner: HtmlResponseSubscriber does not call HtmlResponseAttachmentsProcessor on subrequests

core/lib/Drupal/Core/EventSubscriber/DefaultExceptionHtmlSubscriber.php

@@ -147,7 +147,12 @@ protected function makeSubrequest(GetResponseForExceptionEvent $event, $url, $st
         }
 
         $response = $this->httpKernel->handle($sub_request, HttpKernelInterface::SUB_REQUEST);
-        $response->setStatusCode($status_code);
+        // Only 2xx responses should have their status code overridden; any
+        // other status code should be passed on: redirects (3xx), error (5xx)…
+        // @see https://www.drupal.org/node/2603788#comment-10504916
+        if ($response->isSuccessful()) {
+          $response->setStatusCode($status_code);
+        }
 
         // Persist any special HTTP headers that were set on the exception.
         if ($exception instanceof HttpExceptionInterface) {

core/lib/Drupal/Core/EventSubscriber/HtmlResponsePlaceholderStrategySubscriber.php

@@ -48,10 +48,6 @@ public function __construct(PlaceholderStrategyInterface $placeholder_strategy)
    *   The event to process.
    */
   public function onRespond(FilterResponseEvent $event) {
-    if (!$event->isMasterRequest()) {
-      return;
-    }
-
     $response = $event->getResponse();
     if (!$response instanceof HtmlResponse) {
       return;

core/lib/Drupal/Core/EventSubscriber/HtmlResponseSubscriber.php

@@ -42,10 +42,6 @@ public function __construct(AttachmentsResponseProcessorInterface $html_response
    *   The event to process.
    */
   public function onRespond(FilterResponseEvent $event) {
-    if (!$event->isMasterRequest()) {
-      return;
-    }
-
     $response = $event->getResponse();
     if (!$response instanceof HtmlResponse) {
       return;

core/modules/system/tests/modules/test_page_test/src/Controller/Test.php

@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\test_page_test\Controller;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 /**
  * Defines a test controller for page titles.
@@ -75,4 +76,14 @@ public function renderPage() {
     );
   }
 
+  /**
+   * Throws a HTTP exception.
+   *
+   * @param int $code
+   *   The status code.
+   */
+  public function httpResponseException($code) {
+    throw new HttpException($code);
+  }
+
 }

core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml

@@ -42,3 +42,11 @@ test_page_test.admin_render_title:
     _controller: '\Drupal\test_page_test\Controller\Test::renderTitle'
   requirements:
     _access: 'TRUE'
+
+test_page_test.http_response_exception:
+  path: '/test-http-response-exception/{code}'
+  defaults:
+    _controller: '\Drupal\test_page_test\Controller\Test::httpResponseException'
+    code: 200
+  requirements:
+    _access: 'TRUE'

core/tests/Drupal/KernelTests/RequestProcessing/RedirectOnExceptionTest.php

+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\RequestProcessing\RedirectOnExceptionTest.
+ */
+
+namespace Drupal\KernelTests\RequestProcessing;
+
+use Drupal\KernelTests\KernelTestBase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Tests redirects on exception pages.
+ *
+ * @group request_processing
+ */
+class RedirectOnExceptionTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'test_page_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installSchema('system', ['router', 'url_alias']);
+    \Drupal::service('router.builder')->rebuild();
+  }
+
+  public function testRedirectOn404() {
+    \Drupal::configFactory()->getEditable('system.site')
+      ->set('page.404', '/test-http-response-exception/' . Response::HTTP_PERMANENTLY_REDIRECT)
+      ->save();
+
+    /** @var \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel */
+    $http_kernel = \Drupal::service('http_kernel');
+
+    // Foo doesn't exist, so this triggers the 404 page.
+    $request = Request::create('/foo');
+    $response = $http_kernel->handle($request);
+    $this->assertEquals(Response::HTTP_PERMANENTLY_REDIRECT, $response->getStatusCode());
+  }
+
+}