diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl index f5e25ce36e973..d6b0a6f046738 100644 --- a/app/code/Magento/PageCache/etc/varnish4.vcl +++ b/app/code/Magento/PageCache/etc/varnish4.vcl @@ -166,7 +166,7 @@ sub vcl_backend_response { # cache only successfully responses and 404s if (beresp.status != 200 && beresp.status != 404) { - set beresp.ttl = 0s; + set beresp.ttl = 120s; set beresp.uncacheable = true; return (deliver); } elsif (beresp.http.Cache-Control ~ "private") { diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl index 92bb3394486fc..745cc6c6195d0 100644 --- a/app/code/Magento/PageCache/etc/varnish5.vcl +++ b/app/code/Magento/PageCache/etc/varnish5.vcl @@ -166,11 +166,9 @@ sub vcl_backend_response { } # cache only successfully responses and 404s - if (beresp.status != 200 && beresp.status != 404) { - set beresp.ttl = 0s; - set beresp.uncacheable = true; - return (deliver); - } elsif (beresp.http.Cache-Control ~ "private") { + if (beresp.status != 200 && + beresp.status != 404 && + beresp.http.Cache-Control ~ "private") { set beresp.uncacheable = true; set beresp.ttl = 86400s; return (deliver); diff --git a/app/code/Magento/PageCache/etc/varnish6.vcl b/app/code/Magento/PageCache/etc/varnish6.vcl index eef5e99862538..e4d3123ef45ce 100644 --- a/app/code/Magento/PageCache/etc/varnish6.vcl +++ b/app/code/Magento/PageCache/etc/varnish6.vcl @@ -165,12 +165,10 @@ sub vcl_backend_response { set beresp.http.X-Magento-Cache-Control = beresp.http.Cache-Control; } - # cache only successfully responses and 404s - if (beresp.status != 200 && beresp.status != 404) { - set beresp.ttl = 0s; - set beresp.uncacheable = true; - return (deliver); - } elsif (beresp.http.Cache-Control ~ "private") { + # cache only successfully responses and 404s that are not marked as private + if (beresp.status != 200 && + beresp.status != 404 && + beresp.http.Cache-Control ~ "private") { set beresp.uncacheable = true; set beresp.ttl = 86400s; return (deliver);