Changeset 24513

Timestamp:

11/29/09 00:34:54 (3 years ago)

Author:

FabianLange

Message:

[1.2, 1.3, 1.4] fixed vary cache key again (fixes #7605)

Files:

• branches/1.2/lib/view/sfViewCacheManager.class.php (modified) (1 diff)
• branches/1.3/lib/view/sfViewCacheManager.class.php (modified) (1 diff)
• branches/1.4/lib/view/sfViewCacheManager.class.php (modified) (2 diffs)

branches/1.2/lib/view/sfViewCacheManager.class.php

@@ -170 +170 @@
-        foreach ($varyHeaders as $header)
-        {
-request->getHttpHeader($header).'|
+header . '_' . $request->getHttpHeader($header) . '_
-        }
-
-
+
+
-      }
-      else

branches/1.3/lib/view/sfViewCacheManager.class.php

@@ -201 +201 @@
-      foreach ($varyHeaders as $header)
-      {
-
-
-
-
-
+
-      }
+
+      $vary = preg_replace('/[^a-z0-9]/i', '_', $vary);
+      $vary = preg_replace('/_+/', '_', $vary);
-    }
-

branches/1.4/lib/view/sfViewCacheManager.class.php

@@ -201 +201 @@
-      foreach ($varyHeaders as $header)
-      {
-
-
-
-
-
+
-      }
+
+      $vary = preg_replace('/[^a-z0-9]/i', '_', $vary);
+      $vary = preg_replace('/_+/', '_', $vary);
-    }
-
@@ -399 +398 @@
-  /**
-   * Returns true if the current content is cacheable.
+   *
+   * Possible break in backward compatibility: If the sf_lazy_cache_key
+   * setting is turned on in settings.yml, this method is not used when
+   * initially checking a partial's cacheability.
-   *
-   * @see sfPartialView, isActionCacheable()