purge both http and https from http cache store

dbu · dbu · commit e2cad29ee0d1 · 2017-02-13T09:35:06.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -317,14 +317,31 @@ private function getMetadata($key)
     /**
      * Purges data for the given URL.
      *
+     * This method purges both the http and the https version of the cache entry.
+     *
      * @param string $url A URL
      *
-     * @return bool true if the URL exists and has been purged, false otherwise
+     * @return bool true if the URL exists with either http or https scheme and has been purged, false otherwise
      */
     public function purge($url)
     {
-        $key = $this->getCacheKey(Request::create($url));
+        $url2 = 0 === strpos($url, 'https://')
+            ? preg_replace('https', 'http', $url, 1)
+            : preg_replace('http', 'https', $url, 1);
 
+        return $this->doPurge($url) || $this->doPurge($url2);
+    }
+
+    /**
+     * Purges data for the given URL.
+     *
+     * @param string $url A URL
+     *
+     * @return bool true if the URL exists and has been purged, false otherwise
+     */
+    private function doPurge($url)
+    {
+        $key = $this->getCacheKey(Request::create($url));
         if (isset($this->locks[$key])) {
             flock($this->locks[$key], LOCK_UN);
             fclose($this->locks[$key]);
