opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Core and composer updates

Browse source
This commit is contained in:
Rob Davies 2017-07-03 16:47:07 +01:00
parent a82634bb98
commit 62cac30480
1118 changed files with 21770 additions and 6306 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web/core/modules/page_cache/src/StackMiddleware/PageCache.php
View file

@ -358,7 +358,7 @@ class PageCache implements HttpKernelInterface {
*/
protected function getCacheId(Request $request) {
$cid_parts = [
$request->getUri(),
$request->getSchemeAndHttpHost() . $request->getRequestUri(),
$request->getRequestFormat(),
];
return implode(':', $cid_parts);

40
web/core/modules/page_cache/src/Tests/PageCacheTest.php
View file

@ -539,4 +539,44 @@ class PageCacheTest extends WebTestBase {
$this->assertEqual('The following header was set: <em class="placeholder">Foo</em>: <em class="placeholder">baz</em>', $response_body);
}
/**
* Test that URLs are cached in a not normalized form.
*/
public function testNoUrlNormalization() {
// Use absolute URLs to avoid any processing.
$url = Url::fromRoute('<front>')->setAbsolute()->toString();
// In each test, the first array value is raw URL, the second one is the
// possible normalized URL.
$tests = [
[
$url . '?z=z&a=a',
$url . '?a=a&z=z',
],
[
$url . '?',
$url . '',
],
[
$url . '?a=b+c',
$url . '?a=b%20c',
],
];
foreach ($tests as list($url_raw, $url_normalized)) {
// Initialize cache on raw URL.
$this->drupalGet($url_raw);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
// Ensure cache was set.
$this->drupalGet($url_raw);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', "Cache was set for {$url_raw} URL.");
// Check if the normalized URL is not cached.
$this->drupalGet($url_normalized);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', "Cache is missing for {$url_normalized} URL.");
}
}
}