Merge remote-tracking branch 'remotes/origin/2.1' into 2.2

Author: ViniTou

src/Controller/InvalidateTokenController.php

@@ -10,6 +10,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Symfony\Component\HttpKernel\EventListener\SessionListener;
 
 class InvalidateTokenController
 {
@@ -74,6 +75,8 @@ public function tokenAction(Request $request)
         $headers->set('X-Invalidate-Token', $this->configResolver->getParameter('http_cache.varnish_invalidate_token'));
         $response->setSharedMaxAge($this->ttl);
         $response->setVary('Accept', true);
+        // header to avoid Symfony SessionListener overwriting the response to private
+        $response->headers->set(SessionListener::NO_AUTO_CACHE_CONTROL_HEADER, 1);
 
         return $response;
     }

src/Twig/ContentTaggingExtension.php

@@ -40,6 +40,11 @@ public function getFunctions()
                 'ez_http_cache_tag_location',
                 [$this, 'tagHttpCacheForLocation']
             ),
+            // For 2.5 BC, and to be consistent with the other functions, to be cleaned up with new prefix in the future
+            new TwigFunction(
+                'ez_http_tag_location',
+                [$this, 'tagHttpCacheForLocation']
+            ),
             new TwigFunction(
                 'ez_http_tag_relation_ids',
                 [$this, 'tagHttpCacheForRelationIds']