ENGCOM-6189: Add Cache-Control header to knockout partials #25325

magento-engcom-team · magento-engcom-team · commit 3e4956b17261 · 2019-11-01T04:01:41.000-05:00
- Merge Pull Request #25325 from paveq/magento2:html-caching - Merged commits: 1. 8e17015 2. 8260aa3
diff --git a/nginx.conf.sample b/nginx.conf.sample
@@ -109,7 +109,7 @@ location /static/ {
         rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
     }
 
-    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|json)$ {
+    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|html|json)$ {
         add_header Cache-Control "public";
         add_header X-Frame-Options "SAMEORIGIN";
         expires +1y;
diff --git a/pub/static/.htaccess b/pub/static/.htaccess
@@ -72,7 +72,7 @@ AddType application/xml xml
 
 <IfModule mod_headers.c>
 
-    <FilesMatch .*\.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|json)$>
+    <FilesMatch .*\.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|html|json)$>
         Header append Cache-Control public
     </FilesMatch>
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ location /static/ {`
`109`	`109`	`rewrite ^/static/(version\d/)?(.)$ /static/$2 last;`
`110`	`110`	`}`
`111`	`111`
`112`		`- location ~* \.(ico\|jpg\|jpeg\|png\|gif\|svg\|js\|css\|swf\|eot\|ttf\|otf\|woff\|woff2\|json)$ {`
	`112`	`+ location ~* \.(ico\|jpg\|jpeg\|png\|gif\|svg\|js\|css\|swf\|eot\|ttf\|otf\|woff\|woff2\|html\|json)$ {`
`113`	`113`	`add_header Cache-Control "public";`
`114`	`114`	`add_header X-Frame-Options "SAMEORIGIN";`
`115`	`115`	`expires +1y;`