diff options
| -rw-r--r-- | core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php | 6 | ||||
| -rw-r--r-- | core/modules/simpletest/src/WebTestBase.php | 7 | ||||
| -rw-r--r-- | sites/example.settings.local.php | 7 |
3 files changed, 2 insertions, 18 deletions
diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php index 48b53bd..251b920 100644 --- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php @@ -116,10 +116,8 @@ class FinishResponseSubscriber implements EventSubscriberInterface { $response->headers->set('X-Frame-Options', 'SAMEORIGIN', FALSE); // Expose the cache contexts and cache tags associated with this page in a - // X-Drupal-Cache-Contexts and X-Drupal-Cache-Tags header respectively, when - // either a reverse proxy is being used (so the reverse proxy or CDN can be - // invalidated when appropriate) or when developing/debugging. - if ((Settings::get('reverse_proxy', FALSE) || Settings::get('send_cacheability_headers', FALSE)) && $response instanceof CacheableResponseInterface) { + // X-Drupal-Cache-Contexts and X-Drupal-Cache-Tags header respectively. + if ($response instanceof CacheableResponseInterface) { $response_cacheability = $response->getCacheableMetadata(); $response->headers->set('X-Drupal-Cache-Tags', implode(' ', $response_cacheability->getCacheTags())); $response->headers->set('X-Drupal-Cache-Contexts', implode(' ', $this->cacheContextsManager->optimizeTokens($response_cacheability->getCacheContexts()))); diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php index c11b73b..cc3b270 100644 --- a/core/modules/simpletest/src/WebTestBase.php +++ b/core/modules/simpletest/src/WebTestBase.php @@ -742,13 +742,6 @@ abstract class WebTestBase extends TestBase { 'value' => FALSE, 'required' => TRUE, ]; - - // Send cacheability headers so tests can check their values. - $settings['settings']['send_cacheability_headers'] = (object) [ - 'value' => TRUE, - 'required' => TRUE, - ]; - $this->writeSettings($settings); // Allow for test-specific overrides. $settings_testing_file = DRUPAL_ROOT . '/' . $this->originalSite . '/settings.testing.php'; diff --git a/sites/example.settings.local.php b/sites/example.settings.local.php index 0711fb9..34b4e19 100644 --- a/sites/example.settings.local.php +++ b/sites/example.settings.local.php @@ -59,13 +59,6 @@ $config['system.performance']['js']['preprocess'] = FALSE; $settings['cache']['bins']['render'] = 'cache.backend.null'; /** - * Send cacheablity headers for debugging purposes. - * - * By default, cacheability headers are only sent when behind a reverse proxy. - */ -$settings['send_cacheability_headers'] = TRUE; - -/** * Allow test modules and themes to be installed. * * Drupal ignores test modules and themes by default for performance reasons. |