Drop use of If/Else

Author: LeoColomb

h5bp/web_performance/cache-control.conf

@@ -16,41 +16,25 @@
 <IfModule mod_headers.c>
 
     # No content
-    <If "-z %{CONTENT_TYPE}">
-        Header merge Cache-Control "no-store"
-    </If>
+    Header merge Cache-Control "no-store"                                  "expr=%{CONTENT_TYPE} -z"
 
     # Manifest files
-    <ElseIf "%{CONTENT_TYPE} =~ m#application/manifest\+json#i">
-        Header merge Cache-Control "public"
-    </ElseIf>
-    <ElseIf "%{CONTENT_TYPE} =~ m#text/cache-manifest#i">
-        Header merge Cache-Control "no-cache"
-    </ElseIf>
+    Header merge Cache-Control "public"                                    "expr=%{CONTENT_TYPE} =~ m#application/manifest\+json#i"
+    Header merge Cache-Control "no-cache"                                  "expr=%{CONTENT_TYPE} =~ m#text/cache-manifest#i"
 
     # Assets
-    <ElseIf "%{CONTENT_TYPE} =~ m#image/svg\+xml#i">
-        Header merge Cache-Control "public, immutable, stale-while-revalidate"
-    </ElseIf>
+    Header merge Cache-Control "public, immutable, stale-while-revalidate" "expr=%{CONTENT_TYPE} =~ m#image/svg\+xml#i"
 
     # Data interchange
-    <ElseIf "%{CONTENT_TYPE} =~ m#application/(atom|rdf|rss)\+xml#i">
-        Header merge Cache-Control "public, stale-while-revalidate"
-    </ElseIf>
+    Header merge Cache-Control "public, stale-while-revalidate"            "expr=%{CONTENT_TYPE} =~ m#application/(atom|rdf|rss)\+xml#i"
 
     # Documents
-    <ElseIf "%{CONTENT_TYPE} =~ m#text/(html|markdown|calendar)#i">
-        Header merge Cache-Control "private, must-revalidate"
-    </ElseIf>
+    Header merge Cache-Control "private, must-revalidate"                  "expr=%{CONTENT_TYPE} =~ m#text/(html|markdown|calendar)#i"
 
     # Data
-    <ElseIf "%{CONTENT_TYPE} =~ m#json|xml#i">
-        Header merge Cache-Control "no-cache"
-    </ElseIf>
+    Header merge Cache-Control "no-cache"                                  "expr=%{CONTENT_TYPE} =~ m#json|xml#i"
 
     # Default
-    <Else>
-        Header merge Cache-Control "public, immutable, stale-while-revalidate"
-    </Else>
+    # Header merge Cache-Control "public, immutable, stale-while-revalidate" "expr=%{CONTENT_TYPE}"
 
 </IfModule>