Skip to content

Commit 9e9235c

Browse files
ENGCOM-7765: [vcl] don't set TTL to 0 #28927
2 parents 6b5addf + 433a317 commit 9e9235c

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

app/code/Magento/PageCache/etc/varnish4.vcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ sub vcl_backend_response {
159159

160160
# cache only successfully responses and 404s
161161
if (beresp.status != 200 && beresp.status != 404) {
162-
set beresp.ttl = 0s;
162+
set beresp.ttl = 120s;
163163
set beresp.uncacheable = true;
164164
return (deliver);
165165
} elsif (beresp.http.Cache-Control ~ "private") {

app/code/Magento/PageCache/etc/varnish5.vcl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,9 @@ sub vcl_backend_response {
159159
}
160160

161161
# cache only successfully responses and 404s
162-
if (beresp.status != 200 && beresp.status != 404) {
163-
set beresp.ttl = 0s;
164-
set beresp.uncacheable = true;
165-
return (deliver);
166-
} elsif (beresp.http.Cache-Control ~ "private") {
162+
if (beresp.status != 200 &&
163+
beresp.status != 404 &&
164+
beresp.http.Cache-Control ~ "private") {
167165
set beresp.uncacheable = true;
168166
set beresp.ttl = 86400s;
169167
return (deliver);

app/code/Magento/PageCache/etc/varnish6.vcl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,10 @@ sub vcl_backend_response {
162162
set beresp.http.X-Magento-Cache-Control = beresp.http.Cache-Control;
163163
}
164164

165-
# cache only successfully responses and 404s
166-
if (beresp.status != 200 && beresp.status != 404) {
167-
set beresp.ttl = 0s;
168-
set beresp.uncacheable = true;
169-
return (deliver);
170-
} elsif (beresp.http.Cache-Control ~ "private") {
165+
# cache only successfully responses and 404s that are not marked as private
166+
if (beresp.status != 200 &&
167+
beresp.status != 404 &&
168+
beresp.http.Cache-Control ~ "private") {
171169
set beresp.uncacheable = true;
172170
set beresp.ttl = 86400s;
173171
return (deliver);

0 commit comments

Comments
 (0)