new fixs mhs

.htaccess

@@ -1,9 +1,9 @@
 RewriteEngine On
-    # If an existing asset or directory is requested go to it as it is
-    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
-    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
-    RewriteRule ^ - [L]
-    # If the requested resource doesn't exist, use index.html
+# If an existing asset or directory is requested go to it as it is
+RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
+RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
+RewriteRule ^ - [L]
+# If the requested resource doesn't exist, use index.html
 RewriteRule ^ /index.html
 
 <IfModule mod_expires.c>
@@ -22,19 +22,22 @@ RewriteRule ^ /index.html
 	ExpiresByType video/mpeg "access plus 1 year"
 
 	# CSS, JavaScript
-	ExpiresByType text/css "access plus 1 month"
-	ExpiresByType text/javascript "access plus 1 month"
-	ExpiresByType application/javascript "access plus 1 month"
+	# ExpiresByType text/css "access plus 1 month"
+	# ExpiresByType text/javascript "access plus 1 month"
+	# ExpiresByType application/javascript "access plus 1 month"
 </IfModule>
 
 <IfModule mod_headers.c>
 	<FilesMatch "\.(ttf|ttc|otf|eot|woff|woff2|font.css|css|js)$">
 		Header set Access-Control-Allow-Origin "*"
 	</FilesMatch>
-	<FilesMatch "\.(ico|pdf|flv|swf|gif|png|jpg|jpeg|txt|html|htm)$">
-		Header set Cache-Control "max-age=2592000, public"
+	<FilesMatch "\.(ico|pdf|flv|swf|gif|png|jpg|jpeg|txt)$">
+		Header set Cache-Control "max-age=31536000, public"
 	</FilesMatch>
 	<FilesMatch "\.(css|js)$">
+		Header set Cache-Control "max-age=604800, public"
+	</FilesMatch>
+	<FilesMatch "\.(html|htm)$">
 		FileETag None
 		Header unset ETag
 		Header unset Pragma