From 285adc78cffe016f73718beb3b329ca11a1ab3bf Mon Sep 17 00:00:00 2001
From: Alain Reguera Delgado <alain.reguera@gmail.com>
Date: May 26 2019 22:57:38 +0000
Subject: Update welcome.conf to support content negotiation


---

diff --git a/SOURCES/welcome.conf b/SOURCES/welcome.conf
index 5d1e452..2216d5d 100644
--- a/SOURCES/welcome.conf
+++ b/SOURCES/welcome.conf
@@ -6,13 +6,25 @@
 # NOTE: if this file is removed, it will be restored on upgrades.
 #
 <LocationMatch "^/+$">
-    Options -Indexes
-    ErrorDocument 403 /.noindex.html
+  Options -Indexes
+  ErrorDocument 403 /noindex/index.html
 </LocationMatch>
 
+Alias /noindex /usr/share/httpd/noindex
+
 <Directory /usr/share/httpd/noindex>
-    AllowOverride None
-    Require all granted
-</Directory>
+  Options MultiViews
+  DirectoryIndex index.html
+
+  AddLanguage en-US .en-US
+  AddLanguage es-ES .es-ES
+  AddLanguage zh-CN .zh-CN
+  AddLanguage zh-HK .zh-HK
+  AddLanguage zh-TW .zh-TW
 
-Alias /.noindex.html /usr/share/httpd/noindex/index.html
+  LanguagePriority en-US
+  ForceLanguagePriority Fallback
+
+  AllowOverride None
+  Require all granted
+</Directory>
diff --git a/SPECS/httpd.spec b/SPECS/httpd.spec
index b10fb87..67a0b9f 100644
--- a/SPECS/httpd.spec
+++ b/SPECS/httpd.spec
@@ -783,8 +783,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
-* Tue May 21 2019 Alain Reguera Delgado <alain.reguera@gmail.com> - 2.4.37-12.el8.centos
+* Sun May 26 2019 Alain Reguera Delgado <alain.reguera@gmail.com> - 2.4.37-12.el8.centos
 - Remove index.html, add centos-noindex-8.0.tar.gz
+- Update welcome.conf to support content negotiation based on locale
 
 * Tue May 07 2019 CentOS Sources <bugs@centos.org> - 2.4.37-11.el8.centos
 - Apply debranding changes