Fix usage of symfony cache with shared max age 0

sulu · Jan 23, 2019 · e2fda60 · e2fda60
1 parent 74d1738
commit e2fda60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@ CHANGELOG for Sulu
 ==================
 
 * release/1.5
+    * BUGFIX      #4385 [SuluHttpCacheBundle]   Fix usage of symfony cache with s-max-age 0
     * ENHANCEMENT #4367 [WebsiteBundle]         Remove false deprecation of WebsiteController::renderStructure
     * BUGFIX      #4376 [SecurityBundle]        Exclude role permissions in user API to improve performance
 

diff --git a/src/Sulu/Component/HttpCache/Handler/PublicHandler.php b/src/Sulu/Component/HttpCache/Handler/PublicHandler.php
@@ -85,9 +85,13 @@ public function updateResponse(Response $response, StructureInterface $structure
         // mark the response as either public or private
         $response->setPublic();
 
-        // set the private and shared max age
+        // set the private max age
         $response->setMaxAge($this->maxAge);
-        $response->setSharedMaxAge($this->sharedMaxAge);
+
+        // set shared max age only when not 0 else symfony cache will not work
+        if ($this->sharedMaxAge) {
+            $response->setSharedMaxAge($this->sharedMaxAge);
+        }
 
         $proxyTtl = $this->usePageTtl ?
             $response->getAge() + $cacheLifetime :