diff --git a/docs/varnish/vcl/varnish5.vcl b/docs/varnish/vcl/varnish5.vcl index 15819da..4ac040b 100644 --- a/docs/varnish/vcl/varnish5.vcl +++ b/docs/varnish/vcl/varnish5.vcl @@ -51,7 +51,7 @@ sub vcl_recv { if (req.http.cookie) { set req.http.cookie = ";" + req.http.cookie; set req.http.cookie = regsuball(req.http.cookie, "; +", ";"); - set req.http.cookie = regsuball(req.http.cookie, ";(eZSESSID[^=]*)=", "; \1="); + set req.http.cookie = regsuball(req.http.cookie, ";(IBX_SESSION_ID[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";(ibexa-[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";[^ ][^;]*", ""); set req.http.cookie = regsuball(req.http.cookie, "^[; ]+|[; ]+$", ""); diff --git a/docs/varnish/vcl/varnish6.vcl b/docs/varnish/vcl/varnish6.vcl index a5c8bbf..d4a6b93 100644 --- a/docs/varnish/vcl/varnish6.vcl +++ b/docs/varnish/vcl/varnish6.vcl @@ -51,7 +51,7 @@ sub vcl_recv { if (req.http.cookie) { set req.http.cookie = ";" + req.http.cookie; set req.http.cookie = regsuball(req.http.cookie, "; +", ";"); - set req.http.cookie = regsuball(req.http.cookie, ";(eZSESSID[^=]*)=", "; \1="); + set req.http.cookie = regsuball(req.http.cookie, ";(IBX_SESSION_ID[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";(ibexa-[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";[^ ][^;]*", ""); set req.http.cookie = regsuball(req.http.cookie, "^[; ]+|[; ]+$", ""); diff --git a/docs/varnish/vcl/varnish7.vcl b/docs/varnish/vcl/varnish7.vcl index 3443e75..618e4c8 100644 --- a/docs/varnish/vcl/varnish7.vcl +++ b/docs/varnish/vcl/varnish7.vcl @@ -49,7 +49,7 @@ sub vcl_recv { if (req.http.cookie) { set req.http.cookie = ";" + req.http.cookie; set req.http.cookie = regsuball(req.http.cookie, "; +", ";"); - set req.http.cookie = regsuball(req.http.cookie, ";(eZSESSID[^=]*)=", "; \1="); + set req.http.cookie = regsuball(req.http.cookie, ";(IBX_SESSION_ID[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";(ibexa-[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";[^ ][^;]*", ""); set req.http.cookie = regsuball(req.http.cookie, "^[; ]+|[; ]+$", ""); diff --git a/src/bundle/AppCache.php b/src/bundle/AppCache.php index 2997342..d63eca4 100644 --- a/src/bundle/AppCache.php +++ b/src/bundle/AppCache.php @@ -34,7 +34,7 @@ class AppCache extends HttpCache implements CacheInvalidation public function __construct(KernelInterface $kernel, $cacheDir = null) { parent::__construct($kernel, $cacheDir); - $this->addSubscriber(new UserContextListener(['session_name_prefix' => 'eZSESSID'])); + $this->addSubscriber(new UserContextListener(['session_name_prefix' => 'IBX_SESSION_ID'])); $this->addSubscriber(new PurgeTagsListener(['tags_method' => 'PURGE', 'client_ips' => $this->getInternalAllowedIPs()])); $this->addSubscriber(new PurgeListener(['client_ips' => $this->getInternalAllowedIPs()])); } diff --git a/src/bundle/Resources/config/fos_http_cache.yml b/src/bundle/Resources/config/fos_http_cache.yml index cdb7953..c45ef3b 100644 --- a/src/bundle/Resources/config/fos_http_cache.yml +++ b/src/bundle/Resources/config/fos_http_cache.yml @@ -9,4 +9,4 @@ user_context: enabled: true hash_cache_ttl: 600 # NOTE: These are also defined/used in AppCache, in Varnish VCL, and Fastly VCL - session_name_prefix: eZSESSID + session_name_prefix: IBX_SESSION_ID