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 0f622b160a1645b28575930335c71c227f7f7db1..ba954fa55c3c4fef99bf778f9eb2692e883fd4f2 100644 (file)
--- 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 6cb5443e4544cb40a4ee63d885c74d28f7e50229..20a85713debb02277f665966ca105cd347ad19d0 100644 (file)
--- 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>