apache 2.2.20-1, maj sécurité CVE-2011-3192

6 files changed, 132 insertions, 84 deletions

diff --git a/extra/apache/.footprint.i686 b/extra/apache/.footprint.i686
index 9fb5e414e..eb6e75c7a 100644
--- a/extra/apache/.footprint.i686
+++ b/extra/apache/.footprint.i686
@@ -30,9 +30,8 @@ drwxr-xr-x	root/root	etc/apache/original/extra/
 -rw-r--r--	root/root	etc/apache/original/extra/httpd-vhosts.conf
 -rw-r--r--	root/root	etc/apache/original/httpd.conf
 drwxr-xr-x	root/root	etc/rc.d/
--rwxr-xr-x	root/root	etc/rc.d/apache
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/apache
+-rwxr-xr--	root/root	etc/rc.d/init.d/apache
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K28apache -> ../init.d/apache
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
@@ -342,12 +341,14 @@ drwxr-xr-x	root/root	srv/www/manual/developer/
 -rw-r--r--	root/root	srv/www/manual/developer/debugging.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/documenting.html
 -rw-r--r--	root/root	srv/www/manual/developer/documenting.html.en
+-rw-r--r--	root/root	srv/www/manual/developer/documenting.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/developer/filters.html
 -rw-r--r--	root/root	srv/www/manual/developer/filters.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/hooks.html
 -rw-r--r--	root/root	srv/www/manual/developer/hooks.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/index.html
 -rw-r--r--	root/root	srv/www/manual/developer/index.html.en
+-rw-r--r--	root/root	srv/www/manual/developer/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html.ja.utf8
@@ -374,6 +375,7 @@ drwxr-xr-x	root/root	srv/www/manual/faq/
 -rw-r--r--	root/root	srv/www/manual/faq/index.html
 -rw-r--r--	root/root	srv/www/manual/faq/index.html.en
 -rw-r--r--	root/root	srv/www/manual/faq/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/faq/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/filter.html
 -rw-r--r--	root/root	srv/www/manual/filter.html.en
 -rw-r--r--	root/root	srv/www/manual/filter.html.es
@@ -397,11 +399,13 @@ drwxr-xr-x	root/root	srv/www/manual/faq/
 -rw-r--r--	root/root	srv/www/manual/handler.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/handler.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/handler.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/handler.html.zh-cn
 drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/access.html
 -rw-r--r--	root/root	srv/www/manual/howto/access.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.en
+-rw-r--r--	root/root	srv/www/manual/howto/auth.html.fr
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.tr.utf8
@@ -411,6 +415,7 @@ drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/cgi.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.en
+-rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.fr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.pt-br
@@ -418,6 +423,7 @@ drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.ko.euc-kr
+-rw-r--r--	root/root	srv/www/manual/howto/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html.ja.utf8
@@ -451,6 +457,7 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/images/mod_rewrite_fig2.gif
 -rw-r--r--	root/root	srv/www/manual/images/mod_rewrite_fig2.png
 -rw-r--r--	root/root	srv/www/manual/images/pixel.gif
+-rw-r--r--	root/root	srv/www/manual/images/rewrite_rule_flow.png
 -rw-r--r--	root/root	srv/www/manual/images/right.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig1.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig1.png
@@ -459,6 +466,8 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig3.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig3.png
 -rw-r--r--	root/root	srv/www/manual/images/sub.gif
+-rw-r--r--	root/root	srv/www/manual/images/syntax_rewritecond.png
+-rw-r--r--	root/root	srv/www/manual/images/syntax_rewriterule.png
 -rw-r--r--	root/root	srv/www/manual/images/up.gif
 -rw-r--r--	root/root	srv/www/manual/index.html
 -rw-r--r--	root/root	srv/www/manual/index.html.de
@@ -469,6 +478,7 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/index.html.pt-br
 -rw-r--r--	root/root	srv/www/manual/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/install.html
 -rw-r--r--	root/root	srv/www/manual/install.html.de
 -rw-r--r--	root/root	srv/www/manual/install.html.en
@@ -498,6 +508,7 @@ drwxr-xr-x	root/root	srv/www/manual/misc/
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.en
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/misc/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/misc/password_encryptions.html
 -rw-r--r--	root/root	srv/www/manual/misc/password_encryptions.html.en
 -rw-r--r--	root/root	srv/www/manual/misc/perf-tuning.html
@@ -523,6 +534,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/core.html
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/core.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.tr.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/directive-dict.html
@@ -538,6 +550,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/directives.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/event.html
 -rw-r--r--	root/root	srv/www/manual/mod/event.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/index.html
@@ -547,6 +560,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html.en
@@ -563,13 +577,16 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_asis.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html.ja.utf8
@@ -586,10 +603,12 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_default.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html.ko.euc-kr
@@ -615,6 +634,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_user.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.tr.utf8
@@ -743,6 +763,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_nw_ssl.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ajp.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ajp.html.en
@@ -757,12 +778,14 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ftp.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_scgi.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_scgi.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_reqtimeout.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_reqtimeout.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html.ja.utf8
@@ -788,6 +811,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_substitute.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.tr.utf8
@@ -840,6 +864,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html.en
@@ -853,6 +878,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mpm.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mpm.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mpm.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mpm.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html.de
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html.en
@@ -875,6 +901,7 @@ drwxr-xr-x	root/root	srv/www/manual/platform/
 -rw-r--r--	root/root	srv/www/manual/platform/index.html
 -rw-r--r--	root/root	srv/www/manual/platform/index.html.en
 -rw-r--r--	root/root	srv/www/manual/platform/index.html.ko.euc-kr
+-rw-r--r--	root/root	srv/www/manual/platform/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html.en
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html.ko.euc-kr
@@ -936,6 +963,7 @@ drwxr-xr-x	root/root	srv/www/manual/programs/
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/programs/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html.en
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html.ko.euc-kr
@@ -953,19 +981,36 @@ drwxr-xr-x	root/root	srv/www/manual/programs/
 -rw-r--r--	root/root	srv/www/manual/programs/suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/programs/suexec.html.tr.utf8
 drwxr-xr-x	root/root	srv/www/manual/rewrite/
+-rw-r--r--	root/root	srv/www/manual/rewrite/access.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/access.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/advanced.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/advanced.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/avoid.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/avoid.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/htaccess.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/htaccess.html.en
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/index.html.fr
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html.tr.utf8
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_flags.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_flags.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide_advanced.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide_advanced.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_intro.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_intro.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_tech.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_tech.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/index.html.zh-cn
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/proxy.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/proxy.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/remapping.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/remapping.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/rewritemap.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/rewritemap.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/vhosts.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/vhosts.html.en
 -rw-r--r--	root/root	srv/www/manual/sections.html
 -rw-r--r--	root/root	srv/www/manual/sections.html.en
 -rw-r--r--	root/root	srv/www/manual/sections.html.fr
@@ -984,11 +1029,13 @@ drwxr-xr-x	root/root	srv/www/manual/rewrite/
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/sitemap.html.zh-cn
 drwxr-xr-x	root/root	srv/www/manual/ssl/
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.en
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/ssl/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_compat.html
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_compat.html.en
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_faq.html
@@ -1029,6 +1076,7 @@ drwxr-xr-x	root/root	srv/www/manual/style/xsl/
 drwxr-xr-x	root/root	srv/www/manual/style/xsl/util/
 -rw-r--r--	root/root	srv/www/manual/suexec.html
 -rw-r--r--	root/root	srv/www/manual/suexec.html.en
+-rw-r--r--	root/root	srv/www/manual/suexec.html.fr
 -rw-r--r--	root/root	srv/www/manual/suexec.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/suexec.html.tr.utf8
@@ -1067,6 +1115,7 @@ drwxr-xr-x	root/root	srv/www/manual/vhosts/
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/vhosts/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html.en
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html.fr
diff --git a/extra/apache/.footprint.x86_64 b/extra/apache/.footprint.x86_64
index 9fb5e414e..eb6e75c7a 100644
--- a/extra/apache/.footprint.x86_64
+++ b/extra/apache/.footprint.x86_64
@@ -30,9 +30,8 @@ drwxr-xr-x	root/root	etc/apache/original/extra/
 -rw-r--r--	root/root	etc/apache/original/extra/httpd-vhosts.conf
 -rw-r--r--	root/root	etc/apache/original/httpd.conf
 drwxr-xr-x	root/root	etc/rc.d/
--rwxr-xr-x	root/root	etc/rc.d/apache
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/apache
+-rwxr-xr--	root/root	etc/rc.d/init.d/apache
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K28apache -> ../init.d/apache
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
@@ -342,12 +341,14 @@ drwxr-xr-x	root/root	srv/www/manual/developer/
 -rw-r--r--	root/root	srv/www/manual/developer/debugging.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/documenting.html
 -rw-r--r--	root/root	srv/www/manual/developer/documenting.html.en
+-rw-r--r--	root/root	srv/www/manual/developer/documenting.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/developer/filters.html
 -rw-r--r--	root/root	srv/www/manual/developer/filters.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/hooks.html
 -rw-r--r--	root/root	srv/www/manual/developer/hooks.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/index.html
 -rw-r--r--	root/root	srv/www/manual/developer/index.html.en
+-rw-r--r--	root/root	srv/www/manual/developer/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html.ja.utf8
@@ -374,6 +375,7 @@ drwxr-xr-x	root/root	srv/www/manual/faq/
 -rw-r--r--	root/root	srv/www/manual/faq/index.html
 -rw-r--r--	root/root	srv/www/manual/faq/index.html.en
 -rw-r--r--	root/root	srv/www/manual/faq/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/faq/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/filter.html
 -rw-r--r--	root/root	srv/www/manual/filter.html.en
 -rw-r--r--	root/root	srv/www/manual/filter.html.es
@@ -397,11 +399,13 @@ drwxr-xr-x	root/root	srv/www/manual/faq/
 -rw-r--r--	root/root	srv/www/manual/handler.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/handler.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/handler.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/handler.html.zh-cn
 drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/access.html
 -rw-r--r--	root/root	srv/www/manual/howto/access.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.en
+-rw-r--r--	root/root	srv/www/manual/howto/auth.html.fr
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.tr.utf8
@@ -411,6 +415,7 @@ drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/cgi.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.en
+-rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.fr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.pt-br
@@ -418,6 +423,7 @@ drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.ko.euc-kr
+-rw-r--r--	root/root	srv/www/manual/howto/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html.ja.utf8
@@ -451,6 +457,7 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/images/mod_rewrite_fig2.gif
 -rw-r--r--	root/root	srv/www/manual/images/mod_rewrite_fig2.png
 -rw-r--r--	root/root	srv/www/manual/images/pixel.gif
+-rw-r--r--	root/root	srv/www/manual/images/rewrite_rule_flow.png
 -rw-r--r--	root/root	srv/www/manual/images/right.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig1.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig1.png
@@ -459,6 +466,8 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig3.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig3.png
 -rw-r--r--	root/root	srv/www/manual/images/sub.gif
+-rw-r--r--	root/root	srv/www/manual/images/syntax_rewritecond.png
+-rw-r--r--	root/root	srv/www/manual/images/syntax_rewriterule.png
 -rw-r--r--	root/root	srv/www/manual/images/up.gif
 -rw-r--r--	root/root	srv/www/manual/index.html
 -rw-r--r--	root/root	srv/www/manual/index.html.de
@@ -469,6 +478,7 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/index.html.pt-br
 -rw-r--r--	root/root	srv/www/manual/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/install.html
 -rw-r--r--	root/root	srv/www/manual/install.html.de
 -rw-r--r--	root/root	srv/www/manual/install.html.en
@@ -498,6 +508,7 @@ drwxr-xr-x	root/root	srv/www/manual/misc/
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.en
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/misc/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/misc/password_encryptions.html
 -rw-r--r--	root/root	srv/www/manual/misc/password_encryptions.html.en
 -rw-r--r--	root/root	srv/www/manual/misc/perf-tuning.html
@@ -523,6 +534,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/core.html
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/core.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.tr.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/directive-dict.html
@@ -538,6 +550,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/directives.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/event.html
 -rw-r--r--	root/root	srv/www/manual/mod/event.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/index.html
@@ -547,6 +560,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html.en
@@ -563,13 +577,16 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_asis.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html.ja.utf8
@@ -586,10 +603,12 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_default.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html.ko.euc-kr
@@ -615,6 +634,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_user.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.tr.utf8
@@ -743,6 +763,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_nw_ssl.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ajp.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ajp.html.en
@@ -757,12 +778,14 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ftp.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_scgi.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_scgi.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_reqtimeout.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_reqtimeout.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html.ja.utf8
@@ -788,6 +811,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_substitute.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.tr.utf8
@@ -840,6 +864,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html.en
@@ -853,6 +878,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mpm.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mpm.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mpm.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mpm.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html.de
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html.en
@@ -875,6 +901,7 @@ drwxr-xr-x	root/root	srv/www/manual/platform/
 -rw-r--r--	root/root	srv/www/manual/platform/index.html
 -rw-r--r--	root/root	srv/www/manual/platform/index.html.en
 -rw-r--r--	root/root	srv/www/manual/platform/index.html.ko.euc-kr
+-rw-r--r--	root/root	srv/www/manual/platform/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html.en
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html.ko.euc-kr
@@ -936,6 +963,7 @@ drwxr-xr-x	root/root	srv/www/manual/programs/
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/programs/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html.en
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html.ko.euc-kr
@@ -953,19 +981,36 @@ drwxr-xr-x	root/root	srv/www/manual/programs/
 -rw-r--r--	root/root	srv/www/manual/programs/suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/programs/suexec.html.tr.utf8
 drwxr-xr-x	root/root	srv/www/manual/rewrite/
+-rw-r--r--	root/root	srv/www/manual/rewrite/access.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/access.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/advanced.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/advanced.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/avoid.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/avoid.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/htaccess.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/htaccess.html.en
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/index.html.fr
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html.tr.utf8
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_flags.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_flags.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide_advanced.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide_advanced.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_intro.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_intro.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_tech.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_tech.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/index.html.zh-cn
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/proxy.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/proxy.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/remapping.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/remapping.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/rewritemap.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/rewritemap.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/vhosts.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/vhosts.html.en
 -rw-r--r--	root/root	srv/www/manual/sections.html
 -rw-r--r--	root/root	srv/www/manual/sections.html.en
 -rw-r--r--	root/root	srv/www/manual/sections.html.fr
@@ -984,11 +1029,13 @@ drwxr-xr-x	root/root	srv/www/manual/rewrite/
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/sitemap.html.zh-cn
 drwxr-xr-x	root/root	srv/www/manual/ssl/
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.en
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/ssl/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_compat.html
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_compat.html.en
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_faq.html
@@ -1029,6 +1076,7 @@ drwxr-xr-x	root/root	srv/www/manual/style/xsl/
 drwxr-xr-x	root/root	srv/www/manual/style/xsl/util/
 -rw-r--r--	root/root	srv/www/manual/suexec.html
 -rw-r--r--	root/root	srv/www/manual/suexec.html.en
+-rw-r--r--	root/root	srv/www/manual/suexec.html.fr
 -rw-r--r--	root/root	srv/www/manual/suexec.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/suexec.html.tr.utf8
@@ -1067,6 +1115,7 @@ drwxr-xr-x	root/root	srv/www/manual/vhosts/
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/vhosts/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html.en
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html.fr
diff --git a/extra/apache/.md5sum.i686 b/extra/apache/.md5sum.i686
index 2e2a7dbea..fe5d88154 100644
--- a/extra/apache/.md5sum.i686
+++ b/extra/apache/.md5sum.i686
@@ -1,3 +1,3 @@
-cf00908a82321dabc331c7efdc194a8b  apache
-e02a3ec5925eb9e111400b9aa229f822  httpd-2.2.15-config-1.patch
-16eadc59ea6b38af33874d300973202e  httpd-2.2.17.tar.bz2
+05dc97589bc4efaa1e83783db924e14e  httpd-2.2.17-bdb51-1.patch
+e02a3ec5925eb9e111400b9aa229f822  httpd-2.2.17-config-1.patch
+1ac251431c8c4285f6b085c1d156bb56  httpd-2.2.20.tar.bz2
diff --git a/extra/apache/.md5sum.x86_64 b/extra/apache/.md5sum.x86_64
index 2e2a7dbea..fe5d88154 100644
--- a/extra/apache/.md5sum.x86_64
+++ b/extra/apache/.md5sum.x86_64
@@ -1,3 +1,3 @@
-cf00908a82321dabc331c7efdc194a8b  apache
-e02a3ec5925eb9e111400b9aa229f822  httpd-2.2.15-config-1.patch
-16eadc59ea6b38af33874d300973202e  httpd-2.2.17.tar.bz2
+05dc97589bc4efaa1e83783db924e14e  httpd-2.2.17-bdb51-1.patch
+e02a3ec5925eb9e111400b9aa229f822  httpd-2.2.17-config-1.patch
+1ac251431c8c4285f6b085c1d156bb56  httpd-2.2.20.tar.bz2
diff --git a/extra/apache/Pkgfile b/extra/apache/Pkgfile
index 7036ce61d..a480203b9 100644
--- a/extra/apache/Pkgfile
+++ b/extra/apache/Pkgfile
@@ -6,24 +6,23 @@
 # Run on: apr,sqlite3,libpostgresql
 
 name=apache
-version=2.2.17
+version=2.2.20
 release=1
 source=(http://archive.apache.org/dist/httpd/httpd-$version.tar.bz2 \
-	http://www.linuxfromscratch.org/patches/blfs/svn/httpd-2.2.15-config-1.patch
-        apache )
+	http://www.linuxfromscratch.org/patches/blfs/svn/httpd-2.2.17-bdb51-1.patch \
+	http://www.linuxfromscratch.org/patches/blfs/svn/httpd-2.2.17-config-1.patch )
 build(){
 	source /etc/blfs-bootscripts
         wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
         tar xvf $scripts-$scriptsversion.tar.bz2
    	cd httpd-$version
-	patch -Np1 -i ../httpd-2.2.15-config-1.patch
+	patch -Np1 -i ../httpd-2.2.17-config-1.patch
 	./configure --enable-layout=FHS --enable-mods-shared=all 
 	make 
 	make DESTDIR=$PKG install
 
 	mkdir -p $PKG/etc/ssl/{keys,certs}
 	# Installation
-	install -D -m 755 $SRC/apache $PKG/etc/rc.d/apache
 	chown -R root:root $PKG
 	sed -i "s/^LoadModule isapi_module/# &/" \
 	$PKG/etc/apache/httpd.conf
@@ -35,6 +34,5 @@ build(){
 	# Installation of the script
 	cd ../$scripts-$scriptsversion
 	make DESTDIR=$PKG install-apache
-	install -m755 ../apache $PKG/etc/rc.d/init.d/
 }
   
diff --git a/extra/apache/apache b/extra/apache/apache
deleted file mode 100644
index 264343c1f..000000000
--- a/extra/apache/apache
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/apache
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-
-#$LastChangedBy: bdubbs $
-#$Date: 2007/11/10 15:52:03 $
-
-. /etc/sysconfig/rc
-. $rc_functions
-newgroup=apache
-newuser=apache
-newid=25
-getent group $newgroup > /dev/null || /usr/sbin/groupadd -g $newid $newgroup
-getent passwd $newuser > /dev/null || /usr/sbin/useradd -g $newgroup \
--u $newid -d /dev/null -s /bin/false -c "Apache Server" $newuser
-
-case "$1" in
-	start)
-		boot_mesg "Starting Apache daemon..."
-		/usr/sbin/apachectl -k start
-		evaluate_retval
-		;;
-
-	stop)
-		boot_mesg "Stopping Apache daemon..."
-		/usr/sbin/apachectl -k stop
-		evaluate_retval
-		;;
-
-	restart)
-		boot_mesg "Restarting Apache daemon..."
-		/usr/sbin/apachectl -k restart
-		evaluate_retval
-		;;
-
-	status)
-		statusproc /usr/sbin/httpd
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/apache