Merge pull request #57 from stephenmcm/feature-cacheKey

Fix getCacheKey() to treat urls like SS_HTTPRequest::setUrl()
tractorcow · Mar 19, 2017 · 32dd61c · 32dd61c
2 parents a90a2ef + e3c6613
commit 32dd61c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/code/DynamicCache.php b/code/DynamicCache.php
@@ -246,18 +246,18 @@ protected function getCacheKey($url)
         $fragments = array();
 
         // Segment by protocol (always)
-        $fragments[] = Director::protocol();
+        $fragments['protocol'] = Director::protocol();
 
         // Segment by hostname if necessary
         if (self::config()->segmentHostname) {
-            $fragments[] = $_SERVER['HTTP_HOST'];
+            $fragments['HTTP_HOST'] = $_SERVER['HTTP_HOST'];
         }
 
-        // Segment by url
-        $fragments[] = trim($url, '/');
+        // Clean up url to match SS_HTTPRequest::setUrl() interpretation
+        $fragments['url'] = preg_replace('|/+|', '/', $url);
 
         // Extend
-        $this->extend('updateCacheKeyFragments', $fragments);
+        $this->extend('updateCacheKeyFragments', $fragments, $url);
 
         return "DynamicCache_" . md5(implode('|', array_map('md5', $fragments)));
     }