Merge branch 'MAGETWO-33614' into Accept-Public-PRs

Eugene Tulika · Eugene Tulika · commit feb8acbba5b0 · 2015-03-20T10:06:06.000-05:00
diff --git a/.htaccess b/.htaccess
@@ -167,6 +167,8 @@
 ## http://developer.yahoo.com/performance/rules.html#expires
 
     ExpiresDefault "access plus 1 year"
+    ExpiresByType text/html A0
+    ExpiresByType text/plain A0
 
 </IfModule>
 
diff --git a/.htaccess.sample b/.htaccess.sample
@@ -164,6 +164,8 @@
 ## http://developer.yahoo.com/performance/rules.html#expires
 
     ExpiresDefault "access plus 1 year"
+    ExpiresByType text/html A0
+    ExpiresByType text/plain A0
 
 </IfModule>
 
diff --git a/dev/tests/functional/.htaccess b/dev/tests/functional/.htaccess
@@ -170,6 +170,8 @@
 ## http://developer.yahoo.com/performance/rules.html#expires
 
     ExpiresDefault "access plus 1 year"
+    ExpiresByType text/html A0
+    ExpiresByType text/plain A0
 
 </IfModule>
 
@@ -191,4 +193,4 @@
 ## If running in cluster environment, uncomment this
 ## http://developer.yahoo.com/performance/rules.html#etags
 
-    #FileETag none
+    #FileETag none
diff --git a/nginx.conf.sample b/nginx.conf.sample
@@ -127,6 +127,7 @@ location / {
     }
 
     location ~ (index|get|static|report|404|503)\.php$ {
+        expires -1;
         fastcgi_pass   fastcgi_backend;
 
         fastcgi_param  PHP_FLAG  "session.auto_start=off \n suhosin.session.cryptua=off";
diff --git a/pub/.htaccess b/pub/.htaccess
@@ -153,6 +153,8 @@
 ## http://developer.yahoo.com/performance/rules.html#expires
 
     ExpiresDefault "access plus 1 year"
+    ExpiresByType text/html A0
+    ExpiresByType text/plain A0
 
 </IfModule>
 

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,7 @@ location / {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`location ~ (index\|get\|static\|report\|404\|503)\.php$ {`
	`130`	`+ expires -1;`
`130`	`131`	`fastcgi_pass fastcgi_backend;`
`131`	`132`
`132`	`133`	`fastcgi_param PHP_FLAG "session.auto_start=off \n suhosin.session.cryptua=off";`