http_cache_control--LDCL-55.patch

http_cache_control--LDCL-55.patch

diff --git a/src/EventSubscriber/CacheControlEventSubscriber.php b/src/EventSubscriber/CacheControlEventSubscriber.php
index 89a627cc91fa1c889ac56f56ce597aea761ffb66..1606de60ef1ef229ef0f6accc415ca7dc3fa0742 100644
--- a/src/EventSubscriber/CacheControlEventSubscriber.php
+++ b/src/EventSubscriber/CacheControlEventSubscriber.php
@@ -69,10 +69,14 @@ class CacheControlEventSubscriber implements EventSubscriberInterface {
 
     if ($ttl != $response->getMaxAge()) {
       $response->setClientTtl($ttl);
-      $response->setSharedMaxAge($ttl);
+      if (!$response->headers->hasCacheControlDirective('s-maxage')) {
+        $response->setSharedMaxAge($ttl);
+      }
     }
     elseif ($ttl = $config->get('cache.http.s_maxage')) {
-      $response->setSharedMaxAge($ttl);
+      if (!$response->headers->hasCacheControlDirective('s-maxage')) {
+        $response->setSharedMaxAge($ttl);
+      }
     }
 
     if ($response->getStatusCode() >= 500) {