You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2004/08/16 01:43:56 UTC

cvs commit: httpd-2.0/docs/conf httpd-std.conf.in httpd-win.conf

nd          2004/08/15 16:43:56

  Modified:    docs/conf Tag: APACHE_2_0_BRANCH httpd-std.conf.in
                        httpd-win.conf
  Log:
  simplify configuration
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.27.2.21 +1 -7      httpd-2.0/docs/conf/httpd-std.conf.in
  
  Index: httpd-std.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
  retrieving revision 1.27.2.20
  retrieving revision 1.27.2.21
  diff -u -u -r1.27.2.20 -r1.27.2.21
  --- httpd-std.conf.in	24 Apr 2004 18:13:43 -0000	1.27.2.20
  +++ httpd-std.conf.in	15 Aug 2004 23:43:56 -0000	1.27.2.21
  @@ -574,13 +574,7 @@
           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>
   
  
  
  
  1.75.2.20 +1 -7      httpd-2.0/docs/conf/httpd-win.conf
  
  Index: httpd-win.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-win.conf,v
  retrieving revision 1.75.2.19
  retrieving revision 1.75.2.20
  diff -u -u -r1.75.2.19 -r1.75.2.20
  --- httpd-win.conf	24 Apr 2004 18:13:43 -0000	1.75.2.19
  +++ httpd-win.conf	15 Aug 2004 23:43:56 -0000	1.75.2.20
  @@ -500,13 +500,7 @@
           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>