From 6a6915dc3358d8b3a8d986051e55d31e6081d572 Mon Sep 17 00:00:00 2001
From: Christian Boltz <opensuse@cboltz.de>
Date: Apr 21 2019 08:52:37 +0000
Subject: Use language detection only if "whatever.png" gets requested


... but not if "whatever.xy.png" gets requested.

This ensures that "whatever.xy.png" always gets delivered, even if it
doesn't match the browser's Accept-Language header.

Fixes https://progress.opensuse.org/issues/36213

---

diff --git a/salt/profile/countdown/files/apache-vhost.conf b/salt/profile/countdown/files/apache-vhost.conf
index 9348244..d49b87f 100644
--- a/salt/profile/countdown/files/apache-vhost.conf
+++ b/salt/profile/countdown/files/apache-vhost.conf
@@ -16,14 +16,17 @@
     <Location />
         Options Multiviews FollowSymLinks IncludesNoExec
         DirectoryIndex medium
+    </Location>
+
+    # Use language detection only if "whatever.png" gets requested, but not if "whatever.xy.png" gets requested.
+    # This ensures that "whatever.xy.png" always gets delivered, even if it doesn't match the browser's Accept-Language header.
+    <LocationMatch ^/[^.]*\.png$>
         LanguagePriority en
-        #ForceLanguagePriority Fallback
-        #ForceLanguagePriority Prefer
 
         {% for lang in pillar['profile']['countdown']['languages']|sort %}
         AddLanguage {{lang}} .{{lang}}.png
         {%- endfor %}
-   </Location>
+    </LocationMatch>
 
     RewriteEngine on
     RewriteCond %{REQUEST_FILENAME} !-f