new fixs mhs

.htaccess

@@ -6,34 +6,35 @@ RewriteEngine On
     # If the requested resource doesn't exist, use index.html
 RewriteRule ^ /index.html
 
-<IfModule mod_headers.c>
-  <FilesMatch "\.(ttf|ttc|otf|eot|woff|woff2|font.css|css|js)$">
-    Header set Access-Control-Allow-Origin "*"
-  </FilesMatch>
-</IfModule>
+<IfModule mod_expires.c>
+	ExpiresActive On
 
-<FilesMatch "\.(css|js)$">
-	<IfModule mod_expires.c>
-		ExpiresActive On
+	# Images
+	ExpiresByType image/jpeg "access plus 1 year"
+	ExpiresByType image/gif "access plus 1 year"
+	ExpiresByType image/png "access plus 1 year"
+	ExpiresByType image/webp "access plus 1 year"
+	ExpiresByType image/svg+xml "access plus 1 year"
+	ExpiresByType image/x-icon "access plus 1 year"
 
-		# Images
-		ExpiresByType image/jpeg "access plus 1 year"
-		ExpiresByType image/gif "access plus 1 year"
-		ExpiresByType image/png "access plus 1 year"
-		ExpiresByType image/webp "access plus 1 year"
-		ExpiresByType image/svg+xml "access plus 1 year"
-		ExpiresByType image/x-icon "access plus 1 year"
+	# Video
+	ExpiresByType video/mp4 "access plus 1 year"
+	ExpiresByType video/mpeg "access plus 1 year"
 
-		# Video
-		ExpiresByType video/mp4 "access plus 1 year"
-		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"
+</IfModule>
 
-		# CSS, JavaScript
-		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>
+<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>
+	<FilesMatch "\.(css|js)$">
 		FileETag None
 		Header unset ETag
 		Header unset Pragma
@@ -42,8 +43,8 @@ RewriteRule ^ /index.html
 		Header set Pragma "no-cache"
 		Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
 		Header set Expires "Thu, 1 Jan 1970 00:00:00 GMT"
-	</IfModule>
-</FilesMatch>
+	</FilesMatch>
+</IfModule>
 
 <IfModule mod_mime.c>
 	AddType application/x-javascript .js
@@ -63,17 +64,6 @@ RewriteRule ^ /index.html
 	</IfModule>
 </IfModule>
 
-<IfModule mod_gzip.c>
-  mod_gzip_on Yes
-  mod_gzip_dechunk Yes
-  mod_gzip_item_include file \.(html?|txt|css|js|php|pl)$
-  mod_gzip_item_include handler ^cgi-script$
-  mod_gzip_item_include mime ^text/.*
-  mod_gzip_item_include mime ^application/x-javascript.*
-  mod_gzip_item_exclude mime ^image/.*
-  mod_gzip_item_exclude rspheader ^Content-Encoding:.*gzip.*
-</IfModule>
-
 <IfModule mod_headers.c>
     RewriteCond "%{HTTP:Accept-encoding}" "gzip"
     RewriteCond "%{REQUEST_FILENAME}\.gz" -s