From: André Malo <nd@apache.org>
Date: Sun, 15 Aug 2004 23:43:56 +0000 (+0000)
Subject: simplify configuration
X-Git-Tag: STRIKER_2_0_51_RC1^2~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cee17c20a589ba8b06a42bbd21429e602cab7ebe;p=thirdparty%2Fapache%2Fhttpd.git

simplify configuration


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104677 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 0f622b160a1..ba954fa55c3 100644
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -574,13 +574,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "@exp_manualdir@$1"
         SetHandler type-map
     </Files>
 
-    SetEnvIf Request_URI ^/manual/de/ prefer-language=de
-    SetEnvIf Request_URI ^/manual/en/ prefer-language=en
-    SetEnvIf Request_URI ^/manual/es/ prefer-language=es
-    SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr
-    SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja
-    SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko
-    SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru
+    SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|ru)/ prefer-language=$1
     RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
 </Directory>
 
diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 6cb5443e454..20a85713deb 100644
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -500,13 +500,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "@@ServerRoot@@/manual$
         SetHandler type-map
     </Files>
 
-    SetEnvIf Request_URI ^/manual/de/ prefer-language=de
-    SetEnvIf Request_URI ^/manual/en/ prefer-language=en
-    SetEnvIf Request_URI ^/manual/es/ prefer-language=es
-    SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr
-    SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja
-    SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko
-    SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru
+    SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|ru)/ prefer-language=$1
     RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
 </Directory>