MAGETWO-71434: Generated pages with "html" extension are not cached by Varnish

andimov · andimov · commit 61fee9b299f4 · 2017-08-11T13:48:06.000+03:00
diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -157,14 +157,8 @@ sub vcl_backend_response {
     }
 
     # validate if we need to cache it and prevent from setting cookie
-    # images, css and js are cacheable by default so we have to remove cookie also
     if (beresp.ttl > 0s && (bereq.method == "GET" || bereq.method == "HEAD")) {
         unset beresp.http.set-cookie;
-        if (bereq.url !~ "\.(7z|avi|bmp|bz2|css|csv|doc|docx|eot|flac|flv|gif|gz|ico|jpeg|jpg|js|less|mka|mkv|mov|mp3|mp4|mpeg|mpg|odt|otf|ogg|ogm|opus|pdf|png|ppt|pptx|rar|rtf|svg|svgz|swf|tar|tbz|tgz|tiff|ttf|txt|txz|wav|webm|webp|woff|woff2|xls|xlsx|xml|xz|zip)(\?|$)") {
-            set beresp.http.Pragma = "no-cache";
-            set beresp.http.Expires = "-1";
-            set beresp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";
-        }
     }
 
    # If page is not cacheable then bypass varnish for 2 minutes as Hit-For-Pass
diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -158,14 +158,8 @@ sub vcl_backend_response {
     }
 
     # validate if we need to cache it and prevent from setting cookie
-    # images, css and js are cacheable by default so we have to remove cookie also
     if (beresp.ttl > 0s && (bereq.method == "GET" || bereq.method == "HEAD")) {
         unset beresp.http.set-cookie;
-        if (bereq.url !~ "\.(7z|avi|bmp|bz2|css|csv|doc|docx|eot|flac|flv|gif|gz|ico|jpeg|jpg|js|less|mka|mkv|mov|mp3|mp4|mpeg|mpg|odt|otf|ogg|ogm|opus|pdf|png|ppt|pptx|rar|rtf|svg|svgz|swf|tar|tbz|tgz|tiff|ttf|txt|txz|wav|webm|webp|woff|woff2|xls|xlsx|xml|xz|zip)(\?|$)") {
-            set beresp.http.Pragma = "no-cache";
-            set beresp.http.Expires = "-1";
-            set beresp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";
-        }
     }
 
    # If page is not cacheable then bypass varnish for 2 minutes as Hit-For-Pass

Original file line number	Diff line number	Diff line change
`@@ -157,14 +157,8 @@ sub vcl_backend_response {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`# validate if we need to cache it and prevent from setting cookie`
`160`		`- # images, css and js are cacheable by default so we have to remove cookie also`
`161`	`160`	`if (beresp.ttl > 0s && (bereq.method == "GET" \|\| bereq.method == "HEAD")) {`
`162`	`161`	`unset beresp.http.set-cookie;`
`163`		`- if (bereq.url !~ "\.(7z\|avi\|bmp\|bz2\|css\|csv\|doc\|docx\|eot\|flac\|flv\|gif\|gz\|ico\|jpeg\|jpg\|js\|less\|mka\|mkv\|mov\|mp3\|mp4\|mpeg\|mpg\|odt\|otf\|ogg\|ogm\|opus\|pdf\|png\|ppt\|pptx\|rar\|rtf\|svg\|svgz\|swf\|tar\|tbz\|tgz\|tiff\|ttf\|txt\|txz\|wav\|webm\|webp\|woff\|woff2\|xls\|xlsx\|xml\|xz\|zip)(\?\|$)") {`
`164`		`- set beresp.http.Pragma = "no-cache";`
`165`		`- set beresp.http.Expires = "-1";`
`166`		`- set beresp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";`
`167`		`- }`
`168`	`162`	`}`
`169`	`163`
`170`	`164`	`# If page is not cacheable then bypass varnish for 2 minutes as Hit-For-Pass`
Original file line number	Diff line number	Diff line change
`@@ -158,14 +158,8 @@ sub vcl_backend_response {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`# validate if we need to cache it and prevent from setting cookie`
`161`		`- # images, css and js are cacheable by default so we have to remove cookie also`
`162`	`161`	`if (beresp.ttl > 0s && (bereq.method == "GET" \|\| bereq.method == "HEAD")) {`
`163`	`162`	`unset beresp.http.set-cookie;`
`164`		`- if (bereq.url !~ "\.(7z\|avi\|bmp\|bz2\|css\|csv\|doc\|docx\|eot\|flac\|flv\|gif\|gz\|ico\|jpeg\|jpg\|js\|less\|mka\|mkv\|mov\|mp3\|mp4\|mpeg\|mpg\|odt\|otf\|ogg\|ogm\|opus\|pdf\|png\|ppt\|pptx\|rar\|rtf\|svg\|svgz\|swf\|tar\|tbz\|tgz\|tiff\|ttf\|txt\|txz\|wav\|webm\|webp\|woff\|woff2\|xls\|xlsx\|xml\|xz\|zip)(\?\|$)") {`
`165`		`- set beresp.http.Pragma = "no-cache";`
`166`		`- set beresp.http.Expires = "-1";`
`167`		`- set beresp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";`
`168`		`- }`
`169`	`163`	`}`
`170`	`164`
`171`	`165`	`# If page is not cacheable then bypass varnish for 2 minutes as Hit-For-Pass`