Merge branches '2.2.2-develop-PR' and 'MAGETWO-83152' of https://github.com/magento-qwerty/magento2ce into 2.2.2-develop-PR

Oleksandr Gorkun · Oleksandr Gorkun · commit 1a4e4a24f298 · 2017-11-22T19:16:34.000+02:00
# Conflicts:
#	app/code/Magento/PageCache/etc/varnish4.vcl
#	app/code/Magento/PageCache/etc/varnish5.vcl
diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -189,7 +189,7 @@ sub vcl_deliver {
     }
 
     # Not letting browser to cache non-static files.
-    if (req.url !~ "^/(pub/)?(media|static)/") {
+    if (resp.http.Cache-Control !~ "private" && req.url !~ "^/(pub/)?(media|static)/") {
         set resp.http.Pragma = "no-cache";
         set resp.http.Expires = "-1";
         set resp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";
diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -190,7 +190,7 @@ sub vcl_deliver {
     }
 
     # Not letting browser to cache non-static files.
-    if (req.url !~ "^/(pub/)?(media|static)/") {
+    if (resp.http.Cache-Control !~ "private" && req.url !~ "^/(pub/)?(media|static)/") {
         set resp.http.Pragma = "no-cache";
         set resp.http.Expires = "-1";
         set resp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ sub vcl_deliver {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`# Not letting browser to cache non-static files.`
`192`		`- if (req.url !~ "^/(pub/)?(media\|static)/") {`
	`192`	`+ if (resp.http.Cache-Control !~ "private" && req.url !~ "^/(pub/)?(media\|static)/") {`
`193`	`193`	`set resp.http.Pragma = "no-cache";`
`194`	`194`	`set resp.http.Expires = "-1";`
`195`	`195`	`set resp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ sub vcl_deliver {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`# Not letting browser to cache non-static files.`
`193`		`- if (req.url !~ "^/(pub/)?(media\|static)/") {`
	`193`	`+ if (resp.http.Cache-Control !~ "private" && req.url !~ "^/(pub/)?(media\|static)/") {`
`194`	`194`	`set resp.http.Pragma = "no-cache";`
`195`	`195`	`set resp.http.Expires = "-1";`
`196`	`196`	`set resp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";`