MAGETWO-65007: [GitHub][PR] Set static html fragments as cacheable #8000

 - Merge Pull Request #8000 from paveq/magento2:develop

Author: Oleksii Korshenko

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

@@ -97,7 +97,7 @@ sub vcl_recv {
     set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
 
     # static files are always cacheable. remove SSL flag and cookie
-        if (req.url ~ "^/(pub/)?(media|static)/.*\.(ico|css|js|jpg|jpeg|png|gif|tiff|bmp|mp3|ogg|svg|swf|woff|woff2|eot|ttf|otf)$") {
+        if (req.url ~ "^/(pub/)?(media|static)/.*\.(ico|html|css|js|jpg|jpeg|png|gif|tiff|bmp|mp3|ogg|svg|swf|woff|woff2|eot|ttf|otf)$") {
         unset req.http.Https;
         unset req.http./* {{ ssl_offloaded_header }} */;
         unset req.http.Cookie;

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

@@ -98,7 +98,7 @@ sub vcl_recv {
     set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
 
     # static files are always cacheable. remove SSL flag and cookie
-        if (req.url ~ "^/(pub/)?(media|static)/.*\.(ico|css|js|jpg|jpeg|png|gif|tiff|bmp|mp3|ogg|svg|swf|woff|woff2|eot|ttf|otf)$") {
+        if (req.url ~ "^/(pub/)?(media|static)/.*\.(ico|html|css|js|jpg|jpeg|png|gif|tiff|bmp|mp3|ogg|svg|swf|woff|woff2|eot|ttf|otf)$") {
         unset req.http.Https;
         unset req.http./* {{ ssl_offloaded_header }} */;
         unset req.http.Cookie;

pub/static/.htaccess

@@ -28,6 +28,10 @@ Options -MultiViews
 AddType application/javascript js jsonp
 AddType application/json json
 
+# HTML
+
+AddType text/html html
+
 # CSS
 AddType text/css css
 
@@ -89,11 +93,12 @@ AddType application/xml xml
     ExpiresByType application/x-gzip "access plus 0 seconds"
     ExpiresByType application/x-bzip2 "access plus 0 seconds"
 
-    # CSS, JavaScript
-    <FilesMatch \.(css|js)$>
+    # CSS, JavaScript, html
+    <FilesMatch \.(css|js|html)$>
         ExpiresDefault "access plus 1 year"
     </FilesMatch>
     ExpiresByType text/css "access plus 1 year"
+    ExpiresByType text/html "access plus 1 year"
     ExpiresByType application/javascript "access plus 1 year"
 
     # Favicon, images, flash