- add simplified chinese welcome page

- add .zh-cn extension for zh-CN language code to default config.

Submitted by: kajaa <kajaa@eastday.com>
Reviewed by: <yinglichina@sina.com>

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

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index c622f406c77f09c9a13a85cb14fbe7d5d7770a80..7f8794aa30e09ec459507ecb0428e21762ba1f51 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -751,6 +751,7 @@ AddLanguage es .es
 AddLanguage sv .sv
 AddLanguage cs .cz .cs
 AddLanguage ru .ru
+AddLanguage zh-CN .zh-cn
 AddLanguage zh-TW .zh-tw
 AddLanguage hr .hr
 

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 075a69276d20af248ae98b7315f91aa8a2beb539..04c4faf660fd78a160b7e01956fcb4d91ac1ec81 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -670,6 +670,7 @@ AddLanguage es .es
 AddLanguage sv .sv
 AddLanguage cs .cz .cs
 AddLanguage ru .ru
+AddLanguage zh-CN .zh-cn
 AddLanguage zh-TW .zh-tw
 AddLanguage hr .hr
 

diff --git a/docs/docroot/index.html.var b/docs/docroot/index.html.var
index a9a8bb60e4f4edd2fc69912da3f3053eda508ede..0b20007fbffe38745e20cb6dfa231224d1733674 100644 (file)
--- a/docs/docroot/index.html.var
+++ b/docs/docroot/index.html.var
@@ -114,6 +114,10 @@ URI: index.html.sv
 Content-language: sv
 Content-type: text/html
 
+URI: index.html.zh-cn.gb2312
+Content-language: zh-CN
+Content-type: text/html;charset=GB2312
+
 URI: index.html.zh-tw.big5
 Content-language: tw, zh-TW
 Content-type: text/html;charset=Big5