diff --git a/core/core.services.yml b/core/core.services.yml
index 53a2725..9ab05e6 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -296,7 +296,7 @@ services:
arguments: ['@request_stack', '@url_generator']
form_cache:
class: Drupal\Core\Form\FormCache
- arguments: ['@app.root', '@keyvalue.expirable', '@module_handler', '@current_user', '@csrf_token', '@logger.channel.form', '@config.factory', '@request_stack', '@page_cache_request_policy']
+ arguments: ['@app.root', '@keyvalue.expirable', '@module_handler', '@current_user', '@csrf_token', '@logger.channel.form', '@request_stack', '@page_cache_request_policy']
public: false # Private to form_builder
keyvalue:
class: Drupal\Core\KeyValueStore\KeyValueFactory
@@ -580,11 +580,6 @@ services:
arguments: ['@settings']
tags:
- { name: http_middleware, priority: 300 }
- http_middleware.page_cache:
- class: Drupal\Core\StackMiddleware\PageCache
- arguments: ['@cache.render', '@page_cache_request_policy', '@page_cache_response_policy']
- tags:
- - { name: http_middleware, priority: 200 }
http_middleware.kernel_pre_handle:
class: Drupal\Core\StackMiddleware\KernelPreHandle
arguments: ['@kernel']
diff --git a/core/lib/Drupal/Core/Form/FormCache.php b/core/lib/Drupal/Core/Form/FormCache.php
index ea38fd2..a35000d 100644
--- a/core/lib/Drupal/Core/Form/FormCache.php
+++ b/core/lib/Drupal/Core/Form/FormCache.php
@@ -10,7 +10,6 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Access\CsrfTokenGenerator;
-use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface;
use Drupal\Core\PageCache\RequestPolicyInterface;
@@ -104,20 +103,17 @@ class FormCache implements FormCacheInterface {
* The CSRF token generator.
* @param \Psr\Log\LoggerInterface $logger
* A logger instance.
- * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
- * The configuration factory.
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
* The request stack.
* @param \Drupal\Core\PageCache\RequestPolicyInterface $request_policy
* A policy rule determining the cacheability of a request.
*/
- public function __construct($root, KeyValueExpirableFactoryInterface $key_value_expirable_factory, ModuleHandlerInterface $module_handler, AccountInterface $current_user, CsrfTokenGenerator $csrf_token, LoggerInterface $logger, ConfigFactoryInterface $config_factory, RequestStack $request_stack, RequestPolicyInterface $request_policy) {
+ public function __construct($root, KeyValueExpirableFactoryInterface $key_value_expirable_factory, ModuleHandlerInterface $module_handler, AccountInterface $current_user, CsrfTokenGenerator $csrf_token, LoggerInterface $logger, RequestStack $request_stack, RequestPolicyInterface $request_policy) {
$this->root = $root;
$this->keyValueExpirableFactory = $key_value_expirable_factory;
$this->moduleHandler = $module_handler;
$this->currentUser = $current_user;
$this->logger = $logger;
- $this->configFactory = $config_factory;
$this->csrfToken = $csrf_token;
$this->requestStack = $request_stack;
$this->requestPolicy = $request_policy;
@@ -210,11 +206,6 @@ public function setCache($form_build_id, $form, FormStateInterface $form_state)
$this->keyValueExpirableFactory->get('form')->setWithExpire($form_build_id, $form, $expire);
}
- // Cache form state.
- if ($this->configFactory->get('system.performance')->get('cache.page.use_internal') && $this->isPageCacheable()) {
- $form_state->addBuildInfo('immutable', TRUE);
- }
-
// Store the known list of safe strings for form re-use.
// @todo Ensure we are not storing an excessively large string list in:
// https://www.drupal.org/node/2295823
@@ -225,14 +216,4 @@ public function setCache($form_build_id, $form, FormStateInterface $form_state)
}
}
- /**
- * Checks if the page is cacheable.
- *
- * @return bool
- * TRUE is the page is cacheable, FALSE if not.
- */
- protected function isPageCacheable() {
- return ($this->requestPolicy->check($this->requestStack->getCurrentRequest()) === RequestPolicyInterface::ALLOW);
- }
-
}
diff --git a/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php b/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php
index 8a61f5b..0b27b8a 100644
--- a/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php
+++ b/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php
@@ -24,7 +24,7 @@ class BasicAuthTest extends WebTestBase {
*
* @var array
*/
- public static $modules = array('basic_auth', 'router_test', 'locale');
+ public static $modules = array('basic_auth', 'router_test', 'locale', 'page_cache');
/**
* Test http basic authentication.
@@ -32,7 +32,6 @@ class BasicAuthTest extends WebTestBase {
public function testBasicAuth() {
// Enable page caching.
$config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
$config->set('cache.page.max_age', 300);
$config->save();
diff --git a/core/modules/block/src/Tests/BlockTest.php b/core/modules/block/src/Tests/BlockTest.php
index f543476..c3defb5 100644
--- a/core/modules/block/src/Tests/BlockTest.php
+++ b/core/modules/block/src/Tests/BlockTest.php
@@ -20,6 +20,11 @@
class BlockTest extends BlockTestBase {
/**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['page_cache'];
+
+ /**
* Tests block visibility.
*/
function testBlockVisibility() {
@@ -313,7 +318,6 @@ public function testBlockCacheTags() {
// Enable page caching.
$config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
$config->set('cache.page.max_age', 300);
$config->save();
diff --git a/core/modules/block/src/Tests/BlockTestBase.php b/core/modules/block/src/Tests/BlockTestBase.php
index 1f3cb74..307a435 100644
--- a/core/modules/block/src/Tests/BlockTestBase.php
+++ b/core/modules/block/src/Tests/BlockTestBase.php
@@ -19,7 +19,7 @@
*
* @var array
*/
- public static $modules = array('block', 'filter', 'test_page_test', 'help', 'block_test');
+ protected static $modules = array('block', 'filter', 'test_page_test', 'help', 'block_test');
/**
* A list of theme regions to test.
diff --git a/core/modules/file/src/Tests/DownloadTest.php b/core/modules/file/src/Tests/DownloadTest.php
index 9de1b3a..22bee7a 100644
--- a/core/modules/file/src/Tests/DownloadTest.php
+++ b/core/modules/file/src/Tests/DownloadTest.php
@@ -52,19 +52,6 @@ public function testPrivateFileTransferWithoutPageCache() {
}
/**
- * Test the private file transfer system with page cache.
- */
- public function testPrivateFileTransferWithPageCache() {
- // Turn on page caching and rerun the test.
- $config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
- $config->set('cache.page.max_age', 300);
- $config->save();
-
- $this->doPrivateFileTransferTest();
- }
-
- /**
* Test the private file transfer system.
*/
protected function doPrivateFileTransferTest() {
diff --git a/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php b/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
index abe8ffb..16fc8e6 100644
--- a/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
+++ b/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
@@ -79,22 +79,6 @@ function testImageStyleUrlAndPathPrivateUnclean() {
}
/**
- * Tests an image style URL using the "public://" scheme and page cache.
- */
- public function testImageStyleUrlAndPathPublicWithPageCache() {
- $this->enablePageCache();
- $this->doImageStyleUrlAndPathTests('public');
- }
-
- /**
- * Tests an image style URL using the "private://" scheme and page cache.
- */
- public function testImageStyleUrlAndPathPrivateWithPageCache() {
- $this->enablePageCache();
- $this->doImageStyleUrlAndPathTests('private');
- }
-
- /**
* Tests an image style URL with a file URL that has an extra slash in it.
*/
function testImageStyleUrlExtraSlash() {
@@ -242,15 +226,4 @@ function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_slash =
$this->assertResponse(200, 'Image was accessible at the URL with a missing token.');
}
- /**
- * Turn on page caching.
- */
- protected function enablePageCache() {
- // Turn on page caching and rerun the test.
- $config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
- $config->set('cache.page.max_age', 300);
- $config->save();
- }
-
}
diff --git a/core/modules/language/src/LanguageNegotiator.php b/core/modules/language/src/LanguageNegotiator.php
index bc924fb..2354d88 100644
--- a/core/modules/language/src/LanguageNegotiator.php
+++ b/core/modules/language/src/LanguageNegotiator.php
@@ -188,20 +188,7 @@ protected function negotiateLanguage($type, $method_id) {
$method = $this->negotiatorManager->getDefinition($method_id);
if (!isset($method['types']) || in_array($type, $method['types'])) {
-
- // Check for a cache mode force from settings.php.
- if ($this->settings->get('page_cache_without_database')) {
- $cache_enabled = TRUE;
- }
- else {
- $cache_enabled = $this->configFactory->get('system.performance')->get('cache.page.use_internal');
- }
-
- // If the language negotiation method has no cache preference or this is
- // satisfied we can execute the callback.
- if ($cache = !isset($method['cache']) || $this->currentUser->isAuthenticated() || $method['cache'] == $cache_enabled) {
- $langcode = $this->getNegotiationMethodInstance($method_id)->getLangcode($this->requestStack->getCurrentRequest());
- }
+ $langcode = $this->getNegotiationMethodInstance($method_id)->getLangcode($this->requestStack->getCurrentRequest());
}
$languages = $this->languageManager->getLanguages();
diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationBrowser.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationBrowser.php
index af36c75..00c1fde 100644
--- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationBrowser.php
+++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationBrowser.php
@@ -35,16 +35,16 @@ class LanguageNegotiationBrowser extends LanguageNegotiationMethodBase {
public function getLangcode(Request $request = NULL) {
$langcode = NULL;
- // Whenever browser-based language negotiation is used, the page cannot be
- // cached by reverse proxies.
- // @todo Solve more elegantly in https://www.drupal.org/node/2430335.
- \Drupal::service('page_cache_kill_switch')->trigger();
-
if ($this->languageManager && $request && $request->server->get('HTTP_ACCEPT_LANGUAGE')) {
$http_accept_language = $request->server->get('HTTP_ACCEPT_LANGUAGE');
$langcodes = array_keys($this->languageManager->getLanguages());
$mappings = $this->config->get('language.mappings')->get('map');
$langcode = UserAgent::getBestMatchingLangcode($http_accept_language, $langcodes, $mappings);
+ // Internal page cache with multiple languages and browser negotiation
+ // could lead to wrong cached sites. Therefore disabling the internal
+ // page cache.
+ // @todo Solve more elegantly in https://www.drupal.org/node/2430335.
+ \Drupal::service('page_cache_kill_switch')->trigger();
}
return $langcode;
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml
index 2b6f478..c27f3a9 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml
@@ -14,7 +14,6 @@ process:
'css/preprocess': preprocess_css
'js/preprocess': preprocess_js
'cache/page/max_age': cache_lifetime
- 'cache/page/use_internal': cache
'response/gzip': page_compression
destination:
plugin: config
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemPerformanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemPerformanceTest.php
index 168e2e6..2f13720 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemPerformanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemPerformanceTest.php
@@ -40,8 +40,6 @@ public function testSystemPerformance() {
$this->assertIdentical(FALSE, $config->get('css.preprocess'));
$this->assertIdentical(FALSE, $config->get('js.preprocess'));
$this->assertIdentical(0, $config->get('cache.page.max_age'));
- $this->assertIdentical(TRUE, $config->get('cache.page.use_internal'));
- $this->assertIdentical(TRUE, $config->get('response.gzip'));
}
}
diff --git a/core/modules/page_cache/page_cache.info.yml b/core/modules/page_cache/page_cache.info.yml
new file mode 100644
index 0000000..af72fab
--- /dev/null
+++ b/core/modules/page_cache/page_cache.info.yml
@@ -0,0 +1,6 @@
+name: Internal page cache
+type: module
+description: 'Caches pages for anonymous users. Works well for small to medium-sized websites.'
+package: Core
+version: VERSION
+core: 8.x
diff --git a/core/modules/page_cache/page_cache.module b/core/modules/page_cache/page_cache.module
new file mode 100644
index 0000000..6322363
--- /dev/null
+++ b/core/modules/page_cache/page_cache.module
@@ -0,0 +1,50 @@
+' . t('About') . '';
+ $output .= '
' . t('The Internal page cache module caches pages for anonymous users in the database.') . '
';
+ $output .= '' . t('Uses') . '
';
+ $output .= '';
+ $output .= '- ' . t('Speeding up your site') . '
';
+ $output .= '- ';
+ $output .= '
' . t('Pages requested by anonymous users are stored the first time they are requested and then reused; depending on your site configuration and the amount of your web traffic tied to anonymous visitors, the caching system may significantly increase the speed of your site.');
+ $output .= '
' . t('(For authenticated users, pages need to be assembled for each user individually, but anonymous users all get the exact same version of each page.)') . '
';
+ $output .= ' ';
+ $output .= '- ' . t('Configuring Internal page cache') . '
';
+ $output .= '- ';
+ $output .= '
' . t('On the Performance settings page, you can configure how long browsers and proxies may cache pages, that setting is also respected by the Internal page cache module. There is no other configuration.', array('@cache-settings' => \Drupal::url('system.performance_settings'))) . '
';
+ $output .= ' ';
+ $output .= '
';
+
+ return $output;
+ }
+}
+
+/**
+ * Implements hook_form_alter().
+ */
+function page_cache_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+ // If the page that's being built is cacheable, set the 'immutable' flag, to
+ // ensure that when the form is used, a new form build ID is generated when
+ // appropriate, to prevent information disclosure.
+ $request_policy = \Drupal::service('page_cache_request_policy');
+ $request = \Drupal::requestStack()->getCurrentRequest();
+ $request_is_cacheable = $request_policy->check($request) === RequestPolicyInterface::ALLOW;
+ if ($request_is_cacheable) {
+ $form_state->addBuildInfo('immutable', TRUE);
+ }
+}
diff --git a/core/modules/page_cache/page_cache.services.yml b/core/modules/page_cache/page_cache.services.yml
new file mode 100644
index 0000000..bbddfa7
--- /dev/null
+++ b/core/modules/page_cache/page_cache.services.yml
@@ -0,0 +1,6 @@
+services:
+ http_middleware.page_cache:
+ class: Drupal\page_cache\StackMiddleware\PageCache
+ arguments: ['@cache.render', '@page_cache_request_policy', '@page_cache_response_policy']
+ tags:
+ - { name: http_middleware, priority: 200 }
diff --git a/core/lib/Drupal/Core/StackMiddleware/PageCache.php b/core/modules/page_cache/src/StackMiddleware/PageCache.php
similarity index 87%
rename from core/lib/Drupal/Core/StackMiddleware/PageCache.php
rename to core/modules/page_cache/src/StackMiddleware/PageCache.php
index d4ec291..b0dcce8 100644
--- a/core/lib/Drupal/Core/StackMiddleware/PageCache.php
+++ b/core/modules/page_cache/src/StackMiddleware/PageCache.php
@@ -2,11 +2,12 @@
/**
* @file
- * Contains \Drupal\Core\StackMiddleware\PageCache.
+ * Contains \Drupal\page_cache\StackMiddleware\PageCache.
*/
-namespace Drupal\Core\StackMiddleware;
+namespace Drupal\page_cache\StackMiddleware;
+use Drupal\Component\Utility\UserAgent;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\PageCache\RequestPolicyInterface;
@@ -52,7 +53,7 @@ class PageCache implements HttpKernelInterface {
protected $responsePolicy;
/**
- * Constructs a ReverseProxyMiddleware object.
+ * Constructs a PageCache object.
*
* @param \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel
* The decorated kernel.
@@ -74,20 +75,8 @@ public function __construct(HttpKernelInterface $http_kernel, CacheBackendInterf
* {@inheritdoc}
*/
public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE) {
- if ($type !== static::MASTER_REQUEST) {
- // Only allow page caching on master request.
- $cache_enabled = FALSE;
- }
- elseif (Settings::get('page_cache_without_database')) {
- // Check for a cache mode force from settings.php.
- $cache_enabled = TRUE;
- }
- else {
- $config = $this->config('system.performance');
- $cache_enabled = $config->get('cache.page.use_internal');
- }
-
- if ($cache_enabled && $this->requestPolicy->check($request) === RequestPolicyInterface::ALLOW) {
+ // Only allow page caching on master request.
+ if ($type === static::MASTER_REQUEST && $this->requestPolicy->check($request) === RequestPolicyInterface::ALLOW) {
$response = $this->lookup($request, $type, $catch);
}
else {
@@ -232,20 +221,6 @@ protected function fetch(Request $request, $type = self::MASTER_REQUEST, $catch
return $response;
}
- // Check if the current page may be compressed.
- if (extension_loaded('zlib') && !$response->headers->get('Content-Encoding') && $this->config('system.performance')->get('response.gzip')) {
- $content = $response->getContent();
- if ($content) {
- $response->setContent(gzencode($content, 9, FORCE_GZIP));
- $response->headers->set('Content-Encoding', 'gzip');
- }
-
- // When page compression is enabled, ensure that proxy caches will record
- // and deliver different versions of a page depending on whether the
- // client supports gzip or not.
- $response->setVary('Accept-Encoding', FALSE);
- }
-
// Use the actual timestamp from an Expires header, if available.
$date = $response->getExpires();
$expire = ($date > (new \DateTime())) ? $date->getTimestamp() : Cache::PERMANENT;
@@ -326,16 +301,4 @@ protected function getCacheId(Request $request) {
return implode(':', $cid_parts);
}
- /**
- * Wraps Drupal::config().
- *
- * Config factory is not injected into this class in order to prevent
- * premature initialization of config storage (database).
- *
- * @see \Drupal::config()
- */
- protected function config($name) {
- return \Drupal::config($name);
- }
-
}
diff --git a/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
similarity index 93%
rename from core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php
rename to core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
index 119ecdf..be7d693 100644
--- a/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
@@ -2,19 +2,20 @@
/**
* @file
- * Contains \Drupal\system\Tests\Cache\PageCacheTagsIntegrationTest.
+ * Contains \Drupal\page_cache\Tests\PageCacheTagsIntegrationTest.
*/
-namespace Drupal\system\Tests\Cache;
+namespace Drupal\page_cache\Tests;
use Drupal\Core\Language\LanguageInterface;
use Drupal\simpletest\WebTestBase;
+use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
/**
* Enables the page cache and tests its cache tags in various scenarios.
*
* @group Cache
- * @see \Drupal\system\Tests\Bootstrap\PageCacheTest
+ * @see \Drupal\page_cache\Tests\PageCacheTest
* @see \Drupal\node\Tests\NodePageCacheTest
* @see \Drupal\menu_ui\Tests\MenuTest::testMenuBlockPageCacheTags()
*/
@@ -24,6 +25,11 @@ class PageCacheTagsIntegrationTest extends WebTestBase {
protected $profile = 'standard';
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['page_cache'];
+
protected $dumpHeaders = TRUE;
/**
diff --git a/core/modules/system/src/Tests/Bootstrap/PageCacheTest.php b/core/modules/page_cache/src/Tests/PageCacheTest.php
similarity index 78%
rename from core/modules/system/src/Tests/Bootstrap/PageCacheTest.php
rename to core/modules/page_cache/src/Tests/PageCacheTest.php
index 4256c16..f445920 100644
--- a/core/modules/system/src/Tests/Bootstrap/PageCacheTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTest.php
@@ -2,23 +2,27 @@
/**
* @file
- * Definition of Drupal\system\Tests\Bootstrap\PageCacheTest.
+ * Contains \Drupal\page_cache\Tests\PageCacheTest.
*/
-namespace Drupal\system\Tests\Bootstrap;
+namespace Drupal\page_cache\Tests;
use Drupal\Component\Datetime\DateTimePlus;
+use Drupal\Core\Form\FormState;
+use Drupal\Core\PageCache\ChainRequestPolicy;
+use Drupal\Core\PageCache\RequestPolicy\NoSessionOpen;
use Drupal\Core\Routing\RequestContext;
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
use Drupal\Core\Cache\Cache;
use Drupal\user\Entity\Role;
use Drupal\user\RoleInterface;
+use Symfony\Component\HttpFoundation\Request;
/**
* Enables the page cache and tests it with various HTTP requests.
*
- * @group Bootstrap
+ * @group page_cache
*/
class PageCacheTest extends WebTestBase {
@@ -29,7 +33,7 @@ class PageCacheTest extends WebTestBase {
*
* @var array
*/
- public static $modules = array('test_page_test', 'system_test');
+ public static $modules = array('test_page_test', 'system_test', 'page_cache');
protected function setUp() {
parent::setUp();
@@ -38,6 +42,20 @@ protected function setUp() {
->set('name', 'Drupal')
->set('page.front', 'test-page')
->save();
+
+ $config = $this->config('system.performance');
+ $config->set('cache.page.max_age', 300);
+ $config->save();
+
+ // As the DefaultRequestPolicy deny cache for CLI requests,
+ // build request policy without CLI check.
+ $this->container->set('page_cache_request_policy', NULL);
+ /** @var \Drupal\Core\Session\SessionConfigurationInterface $session_configuration */
+ $session_configuration = $this->container->get('session_configuration');
+ /** @var \Drupal\Core\PageCache\RequestPolicyInterface $request_policy */
+ $request_policy = new ChainRequestPolicy();
+ $request_policy->addPolicy(new NoSessionOpen($session_configuration));
+ $this->container->set('page_cache_request_policy', $request_policy);
}
/**
@@ -47,11 +65,6 @@ protected function setUp() {
* persisted.
*/
function testPageCacheTags() {
- $config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
- $config->set('cache.page.max_age', 300);
- $config->save();
-
$path = 'system-test/cache_tags_page';
$tags = array('system_test_cache_tags_page');
$this->drupalGet($path);
@@ -80,11 +93,6 @@ function testPageCacheTags() {
* Tests support for different cache items with different Accept headers.
*/
function testAcceptHeaderRequests() {
- $config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
- $config->set('cache.page.max_age', 300);
- $config->save();
-
$url_generator = \Drupal::urlGenerator();
$url_generator->setContext(new RequestContext());
$accept_header_cache_uri = $url_generator->getPathFromRoute('system_test.page_cache_accept_header');
@@ -151,11 +159,6 @@ function testAcceptHeaderRequests() {
* Tests support of requests with If-Modified-Since and If-None-Match headers.
*/
function testConditionalRequests() {
- $config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
- $config->set('cache.page.max_age', 300);
- $config->save();
-
// Fill the cache.
$this->drupalGet('');
// Verify the page is not printed twice when the cache is cold.
@@ -196,16 +199,9 @@ function testConditionalRequests() {
* Tests cache headers.
*/
function testPageCache() {
- $config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
- $config->set('cache.page.max_age', 300);
- $config->set('response.gzip', 1);
- $config->save();
-
// Fill the cache.
$this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Page was not cached.');
- $this->assertEqual(strtolower($this->drupalGetHeader('Vary')), 'cookie,accept-encoding', 'Vary header was sent.');
// Symfony's Response logic determines a specific order for the subvalues
// of the Cache-Control header, even if they are explicitly passed in to
// the response header bag in a different order.
@@ -216,7 +212,6 @@ function testPageCache() {
// Check cache.
$this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.');
- $this->assertEqual(strtolower($this->drupalGetHeader('Vary')), 'cookie,accept-encoding', 'Vary: Cookie header was sent.');
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'max-age=300, public', 'Cache-Control header was sent.');
$this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
$this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.');
@@ -225,14 +220,12 @@ function testPageCache() {
$this->drupalGet('system-test/set-header', array('query' => array('name' => 'Expires', 'value' => 'Fri, 19 Nov 2008 05:00:00 GMT')));
$this->assertEqual($this->drupalGetHeader('Expires'), 'Fri, 19 Nov 2008 05:00:00 GMT', 'Default header was replaced.');
$this->drupalGet('system-test/set-header', array('query' => array('name' => 'Vary', 'value' => 'User-Agent')));
- $this->assertEqual(strtolower($this->drupalGetHeader('Vary')), 'user-agent,accept-encoding', 'Default header was replaced.');
// Check that authenticated users bypass the cache.
$user = $this->drupalCreateUser();
$this->drupalLogin($user);
$this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
$this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Caching was bypassed.');
- $this->assertTrue(strpos(strtolower($this->drupalGetHeader('Vary')), 'cookie') === FALSE, 'Vary: Cookie header was not sent.');
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, post-check=0, pre-check=0, private', 'Cache-Control header was sent.');
$this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
$this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.');
@@ -259,7 +252,6 @@ function testPageCache() {
*/
function testPageCacheAnonymousRolePermissions() {
$config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
$config->set('cache.page.max_age', 300);
$config->save();
@@ -311,11 +303,6 @@ function testPageCacheAnonymousRolePermissions() {
* Tests the omit_vary_cookie setting.
*/
public function testPageCacheWithoutVaryCookie() {
- $config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
- $config->set('cache.page.max_age', 300);
- $config->save();
-
$settings['settings']['omit_vary_cookie'] = (object) array(
'value' => TRUE,
'required' => TRUE,
@@ -334,50 +321,23 @@ public function testPageCacheWithoutVaryCookie() {
}
/**
- * Tests page compression.
- *
- * The test should pass even if zlib.output_compression is enabled in php.ini,
- * .htaccess or similar, or if compression is done outside PHP, e.g. by the
- * mod_deflate Apache module.
+ * Test the setting of forms to be immutable.
*/
- function testPageCompression() {
- $config = $this->config('system.performance');
- $config->set('cache.page.use_internal', 1);
- $config->set('cache.page.max_age', 300);
- $config->set('response.gzip', 1);
- $config->save();
+ public function testFormImmutability() {
+ // Install the module that provides the test form.
+ $this->container->get('module_installer')
+ ->install(['page_cache_form_test']);
+ $this->resetAll();
- // Fill the cache and verify that output is compressed.
- $this->drupalGet('', array(), array('Accept-Encoding: gzip,deflate'));
- $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Page was not cached.');
- $this->setRawContent(gzinflate(substr($this->getRawContent(), 10, -8)));
- $this->assertRaw('