upgrade to apache 2.0.46. fixes two vulnerabilities:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0245
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0189

5 files changed, 375 insertions, 68 deletions

diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common
index 2d667d61e38..0d961674010 100644
--- a/www/apache2/Makefile.common
+++ b/www/apache2/Makefile.common
@@ -1,6 +1,6 @@
 DISTNAME=		httpd-${APACHE_VERSION}
-APACHE_VERSION=		2.0.45
-APR_VERSION=            0.9.1
+APACHE_VERSION=		2.0.46
+APR_VERSION=            0.9.4
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/} \
 			http://www.netbsd.org/images/logos/
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index 6415f398f77..4ae86340a63 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2003/05/25 08:58:10 epg Exp $
+@comment $NetBSD: PLIST,v 1.15 2003/05/29 01:02:29 itojun Exp $
 etc/rc.d/apache
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
@@ -143,7 +143,7 @@ share/httpd/htdocs/index.html.ru.koi8-r
 share/httpd/htdocs/index.html.ru.utf8
 share/httpd/htdocs/index.html.sv
 share/httpd/htdocs/index.html.var
-share/httpd/htdocs/index.html.zh
+share/httpd/htdocs/index.html.zh-tw.big5
 share/httpd/icons/README
 share/httpd/icons/a.gif
 share/httpd/icons/a.png
@@ -368,81 +368,144 @@ share/httpd/icons/world2.png
 share/httpd/manual/LICENSE
 share/httpd/manual/bind.html.en
 share/httpd/manual/bind.html.ja.jis
+share/httpd/manual/bind.html.ko.euc-kr
 share/httpd/manual/bind.xml
 share/httpd/manual/bind.xml.ja
+share/httpd/manual/bind.xml.ko
+share/httpd/manual/bind.xml.meta
 share/httpd/manual/cgi_path.html.en
 share/httpd/manual/cgi_path.html.ja.jis
+share/httpd/manual/cgi_path.html.ko.euc-kr
 share/httpd/manual/cgi_path.xml
 share/httpd/manual/cgi_path.xml.ja
+share/httpd/manual/cgi_path.xml.ko
+share/httpd/manual/cgi_path.xml.meta
 share/httpd/manual/configuring.html.en
 share/httpd/manual/configuring.html.ja.jis
+share/httpd/manual/configuring.html.ko.euc-kr
 share/httpd/manual/configuring.xml
 share/httpd/manual/configuring.xml.ja
+share/httpd/manual/configuring.xml.ko
+share/httpd/manual/configuring.xml.meta
 share/httpd/manual/content-negotiation.html.en
 share/httpd/manual/content-negotiation.html.ja.jis
+share/httpd/manual/content-negotiation.html.ko.euc-kr
 share/httpd/manual/content-negotiation.xml
 share/httpd/manual/content-negotiation.xml.ja
+share/httpd/manual/content-negotiation.xml.ko
+share/httpd/manual/content-negotiation.xml.meta
 share/httpd/manual/custom-error.html.en
 share/httpd/manual/custom-error.html.ja.jis
+share/httpd/manual/custom-error.html.ko.euc-kr
 share/httpd/manual/custom-error.xml
 share/httpd/manual/custom-error.xml.ja
-share/httpd/manual/developer/API.html
-share/httpd/manual/developer/debugging.html
-share/httpd/manual/developer/documenting.html
-share/httpd/manual/developer/filters.html
-share/httpd/manual/developer/footer.html
-share/httpd/manual/developer/header.html
-share/httpd/manual/developer/hooks.html
-share/httpd/manual/developer/index.html
-share/httpd/manual/developer/layeredio.html
+share/httpd/manual/custom-error.xml.ko
+share/httpd/manual/custom-error.xml.meta
+share/httpd/manual/developer/API.html.en
+share/httpd/manual/developer/API.xml
+share/httpd/manual/developer/API.xml.meta
+share/httpd/manual/developer/debugging.html.en
+share/httpd/manual/developer/debugging.xml
+share/httpd/manual/developer/debugging.xml.meta
+share/httpd/manual/developer/documenting.html.en
+share/httpd/manual/developer/documenting.xml
+share/httpd/manual/developer/documenting.xml.meta
+share/httpd/manual/developer/filters.html.en
+share/httpd/manual/developer/filters.xml
+share/httpd/manual/developer/filters.xml.meta
+share/httpd/manual/developer/hooks.html.en
+share/httpd/manual/developer/hooks.xml
+share/httpd/manual/developer/hooks.xml.meta
+share/httpd/manual/developer/index.html.en
+share/httpd/manual/developer/index.xml
+share/httpd/manual/developer/index.xml.meta
 share/httpd/manual/developer/modules.html.en
 share/httpd/manual/developer/modules.html.ja.jis
-share/httpd/manual/developer/request.html
-share/httpd/manual/developer/thread_safety.html
+share/httpd/manual/developer/modules.xml
+share/httpd/manual/developer/modules.xml.meta
+share/httpd/manual/developer/request.html.en
+share/httpd/manual/developer/request.xml
+share/httpd/manual/developer/request.xml.meta
+share/httpd/manual/developer/thread_safety.html.en
+share/httpd/manual/developer/thread_safety.xml
+share/httpd/manual/developer/thread_safety.xml.meta
 share/httpd/manual/dns-caveats.html.en
 share/httpd/manual/dns-caveats.html.ja.jis
+share/httpd/manual/dns-caveats.html.ko.euc-kr
 share/httpd/manual/dns-caveats.xml
 share/httpd/manual/dns-caveats.xml.ja
+share/httpd/manual/dns-caveats.xml.ko
+share/httpd/manual/dns-caveats.xml.meta
 share/httpd/manual/dso.html.en
 share/httpd/manual/dso.html.ja.jis
 share/httpd/manual/dso.html.ko.euc-kr
 share/httpd/manual/dso.xml
 share/httpd/manual/dso.xml.ja
+share/httpd/manual/dso.xml.ko
+share/httpd/manual/dso.xml.meta
 share/httpd/manual/env.html.en
 share/httpd/manual/env.html.ja.jis
+share/httpd/manual/env.html.ko.euc-kr
 share/httpd/manual/env.xml
 share/httpd/manual/env.xml.ja
+share/httpd/manual/env.xml.ko
+share/httpd/manual/env.xml.meta
+share/httpd/manual/faq/all_in_one.html.en
+share/httpd/manual/faq/all_in_one.xml
+share/httpd/manual/faq/all_in_one.xml.meta
+share/httpd/manual/faq/categories.xml
+share/httpd/manual/faq/error.html.en
+share/httpd/manual/faq/error.xml
+share/httpd/manual/faq/error.xml.meta
 share/httpd/manual/faq/index.html
+share/httpd/manual/faq/index.html.en
+share/httpd/manual/faq/index.xml
+share/httpd/manual/faq/index.xml.meta
+share/httpd/manual/faq/support.html.en
+share/httpd/manual/faq/support.xml
+share/httpd/manual/faq/support.xml.meta
 share/httpd/manual/filter.html.en
 share/httpd/manual/filter.html.ja.jis
+share/httpd/manual/filter.html.ko.euc-kr
 share/httpd/manual/filter.xml
 share/httpd/manual/filter.xml.ja
-share/httpd/manual/footer.html
+share/httpd/manual/filter.xml.ko
+share/httpd/manual/filter.xml.meta
 share/httpd/manual/glossary.html.en
+share/httpd/manual/glossary.html.ko.euc-kr
 share/httpd/manual/glossary.xml
+share/httpd/manual/glossary.xml.ko
+share/httpd/manual/glossary.xml.meta
 share/httpd/manual/handler.html.en
 share/httpd/manual/handler.html.ja.jis
+share/httpd/manual/handler.html.ko.euc-kr
 share/httpd/manual/handler.xml
 share/httpd/manual/handler.xml.ja
-share/httpd/manual/header.html
+share/httpd/manual/handler.xml.ko
+share/httpd/manual/handler.xml.meta
 share/httpd/manual/howto/auth.html.en
 share/httpd/manual/howto/auth.html.ja.jis
+share/httpd/manual/howto/auth.xml
+share/httpd/manual/howto/auth.xml.meta
 share/httpd/manual/howto/cgi.html.en
 share/httpd/manual/howto/cgi.html.ja.jis
 share/httpd/manual/howto/cgi.xml
 share/httpd/manual/howto/cgi.xml.ja
-share/httpd/manual/howto/footer.html
-share/httpd/manual/howto/header.html
+share/httpd/manual/howto/cgi.xml.meta
 share/httpd/manual/howto/htaccess.html.en
 share/httpd/manual/howto/htaccess.xml
+share/httpd/manual/howto/htaccess.xml.meta
 share/httpd/manual/howto/index.html.en
 share/httpd/manual/howto/index.xml
+share/httpd/manual/howto/index.xml.meta
 share/httpd/manual/howto/public_html.html.en
 share/httpd/manual/howto/public_html.xml
+share/httpd/manual/howto/public_html.xml.meta
 share/httpd/manual/howto/ssi.html.en
 share/httpd/manual/howto/ssi.html.ja.jis
 share/httpd/manual/howto/ssi.xml
 share/httpd/manual/howto/ssi.xml.ja
+share/httpd/manual/howto/ssi.xml.meta
 share/httpd/manual/images/apache_header.gif
 share/httpd/manual/images/apache_header.png
 share/httpd/manual/images/custom_errordocs.gif
@@ -472,6 +535,11 @@ share/httpd/manual/index.html.en
 share/httpd/manual/index.html.fr
 share/httpd/manual/index.html.ja.jis
 share/httpd/manual/index.html.ko.euc-kr
+share/httpd/manual/index.xml
+share/httpd/manual/index.xml.de
+share/httpd/manual/index.xml.ja
+share/httpd/manual/index.xml.ko
+share/httpd/manual/index.xml.meta
 share/httpd/manual/install.html.de
 share/httpd/manual/install.html.en
 share/httpd/manual/install.html.ja.jis
@@ -480,246 +548,377 @@ share/httpd/manual/install.html.ru.koi8-r
 share/httpd/manual/install.xml
 share/httpd/manual/install.xml.de
 share/httpd/manual/install.xml.ja
+share/httpd/manual/install.xml.ko
+share/httpd/manual/install.xml.meta
 share/httpd/manual/install.xml.ru
 share/httpd/manual/invoking.html.de
 share/httpd/manual/invoking.html.en
 share/httpd/manual/invoking.html.ja.jis
+share/httpd/manual/invoking.html.ko.euc-kr
 share/httpd/manual/invoking.html.ru.koi8-r
 share/httpd/manual/invoking.xml
 share/httpd/manual/invoking.xml.de
 share/httpd/manual/invoking.xml.ja
+share/httpd/manual/invoking.xml.ko
+share/httpd/manual/invoking.xml.meta
 share/httpd/manual/invoking.xml.ru
+share/httpd/manual/license.html.en
+share/httpd/manual/license.xml
+share/httpd/manual/license.xml.meta
 share/httpd/manual/logs.html.en
 share/httpd/manual/logs.html.ja.jis
+share/httpd/manual/logs.html.ko.euc-kr
 share/httpd/manual/logs.xml
 share/httpd/manual/logs.xml.ja
+share/httpd/manual/logs.xml.ko
+share/httpd/manual/logs.xml.meta
 share/httpd/manual/misc/custom_errordocs.html.en
 share/httpd/manual/misc/custom_errordocs.xml
+share/httpd/manual/misc/custom_errordocs.xml.meta
 share/httpd/manual/misc/descriptors.html.en
 share/httpd/manual/misc/descriptors.xml
+share/httpd/manual/misc/descriptors.xml.meta
 share/httpd/manual/misc/fin_wait_2.html.en
 share/httpd/manual/misc/fin_wait_2.xml
+share/httpd/manual/misc/fin_wait_2.xml.meta
 share/httpd/manual/misc/index.html.en
 share/httpd/manual/misc/index.xml
+share/httpd/manual/misc/index.xml.meta
 share/httpd/manual/misc/known_client_problems.html.en
 share/httpd/manual/misc/known_client_problems.xml
+share/httpd/manual/misc/known_client_problems.xml.meta
 share/httpd/manual/misc/perf-tuning.html.en
 share/httpd/manual/misc/perf-tuning.xml
+share/httpd/manual/misc/perf-tuning.xml.meta
 share/httpd/manual/misc/rewriteguide.html.en
 share/httpd/manual/misc/rewriteguide.xml
+share/httpd/manual/misc/rewriteguide.xml.meta
 share/httpd/manual/misc/security_tips.html.en
 share/httpd/manual/misc/security_tips.xml
+share/httpd/manual/misc/security_tips.xml.meta
 share/httpd/manual/misc/tutorials.html.en
 share/httpd/manual/misc/tutorials.xml
+share/httpd/manual/misc/tutorials.xml.meta
+share/httpd/manual/mod/allmodules.xml
+share/httpd/manual/mod/allmodules.xml.de
+share/httpd/manual/mod/allmodules.xml.ja
+share/httpd/manual/mod/allmodules.xml.ko
+share/httpd/manual/mod/allmodules.xml.ru
 share/httpd/manual/mod/beos.html.en
+share/httpd/manual/mod/beos.html.ko.euc-kr
 share/httpd/manual/mod/beos.xml
+share/httpd/manual/mod/beos.xml.ko
+share/httpd/manual/mod/beos.xml.meta
 share/httpd/manual/mod/core.html.de
 share/httpd/manual/mod/core.html.en
 share/httpd/manual/mod/core.xml
 share/httpd/manual/mod/core.xml.de
+share/httpd/manual/mod/core.xml.meta
 share/httpd/manual/mod/directive-dict.html.en
 share/httpd/manual/mod/directive-dict.html.ja.jis
+share/httpd/manual/mod/directive-dict.html.ko.euc-kr
 share/httpd/manual/mod/directive-dict.xml
 share/httpd/manual/mod/directive-dict.xml.ja
+share/httpd/manual/mod/directive-dict.xml.ko
+share/httpd/manual/mod/directive-dict.xml.meta
 share/httpd/manual/mod/directives.html.de
 share/httpd/manual/mod/directives.html.en
 share/httpd/manual/mod/directives.html.ja.jis
+share/httpd/manual/mod/directives.html.ko.euc-kr
 share/httpd/manual/mod/directives.html.ru.koi8-r
 share/httpd/manual/mod/directives.xml
 share/httpd/manual/mod/directives.xml.de
 share/httpd/manual/mod/directives.xml.ja
+share/httpd/manual/mod/directives.xml.ko
+share/httpd/manual/mod/directives.xml.meta
 share/httpd/manual/mod/directives.xml.ru
-share/httpd/manual/mod/footer.html
-share/httpd/manual/mod/header.html
 share/httpd/manual/mod/index.html.de
 share/httpd/manual/mod/index.html.en
 share/httpd/manual/mod/index.html.ja.jis
+share/httpd/manual/mod/index.html.ko.euc-kr
 share/httpd/manual/mod/index.xml
 share/httpd/manual/mod/index.xml.de
 share/httpd/manual/mod/index.xml.ja
+share/httpd/manual/mod/index.xml.ko
+share/httpd/manual/mod/index.xml.meta
 share/httpd/manual/mod/leader.html.en
+share/httpd/manual/mod/leader.html.ko.euc-kr
 share/httpd/manual/mod/leader.xml
+share/httpd/manual/mod/leader.xml.ko
+share/httpd/manual/mod/leader.xml.meta
 share/httpd/manual/mod/mod_access.html.en
 share/httpd/manual/mod/mod_access.html.ja.jis
 share/httpd/manual/mod/mod_access.xml
 share/httpd/manual/mod/mod_access.xml.ja
+share/httpd/manual/mod/mod_access.xml.meta
 share/httpd/manual/mod/mod_actions.html.en
 share/httpd/manual/mod/mod_actions.html.ja.jis
+share/httpd/manual/mod/mod_actions.html.ko.euc-kr
 share/httpd/manual/mod/mod_actions.xml
 share/httpd/manual/mod/mod_actions.xml.ja
+share/httpd/manual/mod/mod_actions.xml.ko
+share/httpd/manual/mod/mod_actions.xml.meta
 share/httpd/manual/mod/mod_alias.html.en
 share/httpd/manual/mod/mod_alias.html.ja.jis
 share/httpd/manual/mod/mod_alias.xml
 share/httpd/manual/mod/mod_alias.xml.ja
+share/httpd/manual/mod/mod_alias.xml.meta
 share/httpd/manual/mod/mod_asis.html.en
 share/httpd/manual/mod/mod_asis.html.ja.jis
+share/httpd/manual/mod/mod_asis.html.ko.euc-kr
 share/httpd/manual/mod/mod_asis.xml
 share/httpd/manual/mod/mod_asis.xml.ja
+share/httpd/manual/mod/mod_asis.xml.ko
+share/httpd/manual/mod/mod_asis.xml.meta
 share/httpd/manual/mod/mod_auth.html.en
 share/httpd/manual/mod/mod_auth.html.ja.jis
 share/httpd/manual/mod/mod_auth.xml
 share/httpd/manual/mod/mod_auth.xml.ja
+share/httpd/manual/mod/mod_auth.xml.meta
 share/httpd/manual/mod/mod_auth_anon.html.en
 share/httpd/manual/mod/mod_auth_anon.xml
+share/httpd/manual/mod/mod_auth_anon.xml.meta
 share/httpd/manual/mod/mod_auth_dbm.html.en
 share/httpd/manual/mod/mod_auth_dbm.xml
+share/httpd/manual/mod/mod_auth_dbm.xml.meta
 share/httpd/manual/mod/mod_auth_digest.html.en
 share/httpd/manual/mod/mod_auth_digest.xml
+share/httpd/manual/mod/mod_auth_digest.xml.meta
 share/httpd/manual/mod/mod_auth_ldap.html.en
 share/httpd/manual/mod/mod_auth_ldap.xml
+share/httpd/manual/mod/mod_auth_ldap.xml.meta
 share/httpd/manual/mod/mod_autoindex.html.en
 share/httpd/manual/mod/mod_autoindex.html.ja.jis
+share/httpd/manual/mod/mod_autoindex.html.ko.euc-kr
 share/httpd/manual/mod/mod_autoindex.xml
 share/httpd/manual/mod/mod_autoindex.xml.ja
+share/httpd/manual/mod/mod_autoindex.xml.ko
+share/httpd/manual/mod/mod_autoindex.xml.meta
 share/httpd/manual/mod/mod_cache.html.en
+share/httpd/manual/mod/mod_cache.html.ko.euc-kr
 share/httpd/manual/mod/mod_cache.xml
+share/httpd/manual/mod/mod_cache.xml.ko
+share/httpd/manual/mod/mod_cache.xml.meta
 share/httpd/manual/mod/mod_cern_meta.html.en
+share/httpd/manual/mod/mod_cern_meta.html.ko.euc-kr
 share/httpd/manual/mod/mod_cern_meta.xml
+share/httpd/manual/mod/mod_cern_meta.xml.ko
+share/httpd/manual/mod/mod_cern_meta.xml.meta
 share/httpd/manual/mod/mod_cgi.html.en
 share/httpd/manual/mod/mod_cgi.html.ja.jis
+share/httpd/manual/mod/mod_cgi.html.ko.euc-kr
 share/httpd/manual/mod/mod_cgi.xml
 share/httpd/manual/mod/mod_cgi.xml.ja
+share/httpd/manual/mod/mod_cgi.xml.ko
+share/httpd/manual/mod/mod_cgi.xml.meta
 share/httpd/manual/mod/mod_cgid.html.en
+share/httpd/manual/mod/mod_cgid.html.ko.euc-kr
 share/httpd/manual/mod/mod_cgid.xml
+share/httpd/manual/mod/mod_cgid.xml.ko
+share/httpd/manual/mod/mod_cgid.xml.meta
 share/httpd/manual/mod/mod_charset_lite.html.en
+share/httpd/manual/mod/mod_charset_lite.html.ko.euc-kr
 share/httpd/manual/mod/mod_charset_lite.xml
+share/httpd/manual/mod/mod_charset_lite.xml.ko
+share/httpd/manual/mod/mod_charset_lite.xml.meta
 share/httpd/manual/mod/mod_dav.html.en
 share/httpd/manual/mod/mod_dav.html.ja.jis
+share/httpd/manual/mod/mod_dav.html.ko.euc-kr
 share/httpd/manual/mod/mod_dav.xml
 share/httpd/manual/mod/mod_dav.xml.ja
+share/httpd/manual/mod/mod_dav.xml.ko
+share/httpd/manual/mod/mod_dav.xml.meta
 share/httpd/manual/mod/mod_dav_fs.html.en
+share/httpd/manual/mod/mod_dav_fs.html.ja.jis
+share/httpd/manual/mod/mod_dav_fs.html.ko.euc-kr
 share/httpd/manual/mod/mod_dav_fs.xml
 share/httpd/manual/mod/mod_dav_fs.xml.ja
+share/httpd/manual/mod/mod_dav_fs.xml.ko
+share/httpd/manual/mod/mod_dav_fs.xml.meta
 share/httpd/manual/mod/mod_deflate.html.en
 share/httpd/manual/mod/mod_deflate.html.ja.jis
+share/httpd/manual/mod/mod_deflate.html.ko.euc-kr
 share/httpd/manual/mod/mod_deflate.xml
 share/httpd/manual/mod/mod_deflate.xml.ja
+share/httpd/manual/mod/mod_deflate.xml.ko
+share/httpd/manual/mod/mod_deflate.xml.meta
 share/httpd/manual/mod/mod_dir.html.en
 share/httpd/manual/mod/mod_dir.html.ja.jis
+share/httpd/manual/mod/mod_dir.html.ko.euc-kr
 share/httpd/manual/mod/mod_dir.xml
 share/httpd/manual/mod/mod_dir.xml.ja
+share/httpd/manual/mod/mod_dir.xml.ko
+share/httpd/manual/mod/mod_dir.xml.meta
 share/httpd/manual/mod/mod_disk_cache.html.en
+share/httpd/manual/mod/mod_disk_cache.html.ko.euc-kr
 share/httpd/manual/mod/mod_disk_cache.xml
+share/httpd/manual/mod/mod_disk_cache.xml.ko
+share/httpd/manual/mod/mod_disk_cache.xml.meta
 share/httpd/manual/mod/mod_echo.html.en
 share/httpd/manual/mod/mod_echo.html.ja.jis
+share/httpd/manual/mod/mod_echo.html.ko.euc-kr
 share/httpd/manual/mod/mod_echo.xml
 share/httpd/manual/mod/mod_echo.xml.ja
+share/httpd/manual/mod/mod_echo.xml.ko
+share/httpd/manual/mod/mod_echo.xml.meta
 share/httpd/manual/mod/mod_env.html.en
 share/httpd/manual/mod/mod_env.html.ja.jis
+share/httpd/manual/mod/mod_env.html.ko.euc-kr
 share/httpd/manual/mod/mod_env.xml
 share/httpd/manual/mod/mod_env.xml.ja
+share/httpd/manual/mod/mod_env.xml.ko
+share/httpd/manual/mod/mod_env.xml.meta
 share/httpd/manual/mod/mod_example.html.en
 share/httpd/manual/mod/mod_example.xml
+share/httpd/manual/mod/mod_example.xml.meta
 share/httpd/manual/mod/mod_expires.html.en
 share/httpd/manual/mod/mod_expires.xml
+share/httpd/manual/mod/mod_expires.xml.meta
 share/httpd/manual/mod/mod_ext_filter.html.en
 share/httpd/manual/mod/mod_ext_filter.xml
+share/httpd/manual/mod/mod_ext_filter.xml.meta
 share/httpd/manual/mod/mod_file_cache.html.en
 share/httpd/manual/mod/mod_file_cache.xml
+share/httpd/manual/mod/mod_file_cache.xml.meta
 share/httpd/manual/mod/mod_headers.html.en
 share/httpd/manual/mod/mod_headers.xml
+share/httpd/manual/mod/mod_headers.xml.meta
 share/httpd/manual/mod/mod_imap.html.en
 share/httpd/manual/mod/mod_imap.xml
+share/httpd/manual/mod/mod_imap.xml.meta
 share/httpd/manual/mod/mod_include.html.en
 share/httpd/manual/mod/mod_include.html.ja.jis
 share/httpd/manual/mod/mod_include.xml
 share/httpd/manual/mod/mod_include.xml.ja
+share/httpd/manual/mod/mod_include.xml.meta
 share/httpd/manual/mod/mod_info.html.en
 share/httpd/manual/mod/mod_info.html.ja.jis
 share/httpd/manual/mod/mod_info.xml
 share/httpd/manual/mod/mod_info.xml.ja
+share/httpd/manual/mod/mod_info.xml.meta
 share/httpd/manual/mod/mod_isapi.html.en
 share/httpd/manual/mod/mod_isapi.xml
+share/httpd/manual/mod/mod_isapi.xml.meta
 share/httpd/manual/mod/mod_ldap.html.en
 share/httpd/manual/mod/mod_ldap.xml
+share/httpd/manual/mod/mod_ldap.xml.meta
 share/httpd/manual/mod/mod_log_config.html.en
 share/httpd/manual/mod/mod_log_config.xml
+share/httpd/manual/mod/mod_log_config.xml.meta
 share/httpd/manual/mod/mod_logio.html.en
 share/httpd/manual/mod/mod_logio.xml
+share/httpd/manual/mod/mod_logio.xml.meta
 share/httpd/manual/mod/mod_mem_cache.html.en
 share/httpd/manual/mod/mod_mem_cache.xml
+share/httpd/manual/mod/mod_mem_cache.xml.meta
 share/httpd/manual/mod/mod_mime.html.en
 share/httpd/manual/mod/mod_mime.html.ja.jis
 share/httpd/manual/mod/mod_mime.xml
 share/httpd/manual/mod/mod_mime.xml.ja
+share/httpd/manual/mod/mod_mime.xml.meta
 share/httpd/manual/mod/mod_mime_magic.html.en
 share/httpd/manual/mod/mod_mime_magic.xml
+share/httpd/manual/mod/mod_mime_magic.xml.meta
 share/httpd/manual/mod/mod_negotiation.html.en
 share/httpd/manual/mod/mod_negotiation.html.ja.jis
 share/httpd/manual/mod/mod_negotiation.xml
 share/httpd/manual/mod/mod_negotiation.xml.ja
+share/httpd/manual/mod/mod_negotiation.xml.meta
 share/httpd/manual/mod/mod_nw_ssl.html.en
 share/httpd/manual/mod/mod_nw_ssl.xml
+share/httpd/manual/mod/mod_nw_ssl.xml.meta
 share/httpd/manual/mod/mod_proxy.html.en
 share/httpd/manual/mod/mod_proxy.xml
+share/httpd/manual/mod/mod_proxy.xml.meta
 share/httpd/manual/mod/mod_proxy_connect.html.en
 share/httpd/manual/mod/mod_proxy_connect.xml
+share/httpd/manual/mod/mod_proxy_connect.xml.meta
 share/httpd/manual/mod/mod_proxy_ftp.html.en
 share/httpd/manual/mod/mod_proxy_ftp.xml
+share/httpd/manual/mod/mod_proxy_ftp.xml.meta
 share/httpd/manual/mod/mod_proxy_http.html.en
 share/httpd/manual/mod/mod_proxy_http.xml
+share/httpd/manual/mod/mod_proxy_http.xml.meta
 share/httpd/manual/mod/mod_rewrite.html.en
 share/httpd/manual/mod/mod_rewrite.xml
+share/httpd/manual/mod/mod_rewrite.xml.meta
 share/httpd/manual/mod/mod_setenvif.html.en
 share/httpd/manual/mod/mod_setenvif.html.ja.jis
 share/httpd/manual/mod/mod_setenvif.xml
 share/httpd/manual/mod/mod_setenvif.xml.ja
+share/httpd/manual/mod/mod_setenvif.xml.meta
 share/httpd/manual/mod/mod_so.html.en
 share/httpd/manual/mod/mod_so.html.ja.jis
 share/httpd/manual/mod/mod_so.xml
 share/httpd/manual/mod/mod_so.xml.ja
+share/httpd/manual/mod/mod_so.xml.meta
 share/httpd/manual/mod/mod_speling.html.en
 share/httpd/manual/mod/mod_speling.html.ja.jis
 share/httpd/manual/mod/mod_speling.xml
 share/httpd/manual/mod/mod_speling.xml.ja
+share/httpd/manual/mod/mod_speling.xml.meta
 share/httpd/manual/mod/mod_ssl.html.en
 share/httpd/manual/mod/mod_ssl.xml
+share/httpd/manual/mod/mod_ssl.xml.meta
 share/httpd/manual/mod/mod_status.html.en
 share/httpd/manual/mod/mod_status.xml
+share/httpd/manual/mod/mod_status.xml.meta
 share/httpd/manual/mod/mod_suexec.html.en
 share/httpd/manual/mod/mod_suexec.html.ja.jis
 share/httpd/manual/mod/mod_suexec.xml
 share/httpd/manual/mod/mod_suexec.xml.ja
+share/httpd/manual/mod/mod_suexec.xml.meta
 share/httpd/manual/mod/mod_unique_id.html.en
 share/httpd/manual/mod/mod_unique_id.html.ja.jis
 share/httpd/manual/mod/mod_unique_id.xml
 share/httpd/manual/mod/mod_unique_id.xml.ja
+share/httpd/manual/mod/mod_unique_id.xml.meta
 share/httpd/manual/mod/mod_userdir.html.en
 share/httpd/manual/mod/mod_userdir.html.ja.jis
 share/httpd/manual/mod/mod_userdir.xml
 share/httpd/manual/mod/mod_userdir.xml.ja
+share/httpd/manual/mod/mod_userdir.xml.meta
 share/httpd/manual/mod/mod_usertrack.html.en
 share/httpd/manual/mod/mod_usertrack.xml
+share/httpd/manual/mod/mod_usertrack.xml.meta
 share/httpd/manual/mod/mod_vhost_alias.html.en
 share/httpd/manual/mod/mod_vhost_alias.xml
+share/httpd/manual/mod/mod_vhost_alias.xml.meta
 share/httpd/manual/mod/module-dict.html.en
 share/httpd/manual/mod/module-dict.html.ja.jis
 share/httpd/manual/mod/module-dict.xml
 share/httpd/manual/mod/module-dict.xml.ja
+share/httpd/manual/mod/module-dict.xml.meta
 share/httpd/manual/mod/mpm_common.html.de
 share/httpd/manual/mod/mpm_common.html.en
 share/httpd/manual/mod/mpm_common.html.ja.jis
 share/httpd/manual/mod/mpm_common.xml
 share/httpd/manual/mod/mpm_common.xml.de
 share/httpd/manual/mod/mpm_common.xml.ja
+share/httpd/manual/mod/mpm_common.xml.meta
 share/httpd/manual/mod/mpm_netware.html.en
 share/httpd/manual/mod/mpm_netware.xml
+share/httpd/manual/mod/mpm_netware.xml.meta
 share/httpd/manual/mod/mpm_winnt.html.de
 share/httpd/manual/mod/mpm_winnt.html.en
 share/httpd/manual/mod/mpm_winnt.html.ja.jis
 share/httpd/manual/mod/mpm_winnt.xml
 share/httpd/manual/mod/mpm_winnt.xml.de
 share/httpd/manual/mod/mpm_winnt.xml.ja
+share/httpd/manual/mod/mpm_winnt.xml.meta
 share/httpd/manual/mod/mpmt_os2.html.en
 share/httpd/manual/mod/mpmt_os2.xml
+share/httpd/manual/mod/mpmt_os2.xml.meta
 share/httpd/manual/mod/perchild.html.en
 share/httpd/manual/mod/perchild.xml
+share/httpd/manual/mod/perchild.xml.meta
 share/httpd/manual/mod/prefork.html.de
 share/httpd/manual/mod/prefork.html.en
 share/httpd/manual/mod/prefork.html.ja.jis
 share/httpd/manual/mod/prefork.xml
 share/httpd/manual/mod/prefork.xml.de
 share/httpd/manual/mod/prefork.xml.ja
+share/httpd/manual/mod/prefork.xml.meta
 share/httpd/manual/mod/quickreference.html.de
 share/httpd/manual/mod/quickreference.html.en
 share/httpd/manual/mod/quickreference.html.ja.jis
@@ -727,21 +926,26 @@ share/httpd/manual/mod/quickreference.html.ru.koi8-r
 share/httpd/manual/mod/quickreference.xml
 share/httpd/manual/mod/quickreference.xml.de
 share/httpd/manual/mod/quickreference.xml.ja
+share/httpd/manual/mod/quickreference.xml.meta
 share/httpd/manual/mod/quickreference.xml.ru
 share/httpd/manual/mod/threadpool.html.en
 share/httpd/manual/mod/threadpool.xml
+share/httpd/manual/mod/threadpool.xml.meta
 share/httpd/manual/mod/worker.html.de
 share/httpd/manual/mod/worker.html.en
 share/httpd/manual/mod/worker.html.ja.jis
 share/httpd/manual/mod/worker.xml
 share/httpd/manual/mod/worker.xml.de
 share/httpd/manual/mod/worker.xml.ja
+share/httpd/manual/mod/worker.xml.meta
 share/httpd/manual/mpm.html.en
 share/httpd/manual/mpm.html.ja.jis
 share/httpd/manual/mpm.html.ko.euc-kr
 share/httpd/manual/mpm.html.ru.koi8-r
 share/httpd/manual/mpm.xml
 share/httpd/manual/mpm.xml.ja
+share/httpd/manual/mpm.xml.ko
+share/httpd/manual/mpm.xml.meta
 share/httpd/manual/mpm.xml.ru
 share/httpd/manual/new_features_2_0.html.de
 share/httpd/manual/new_features_2_0.html.en
@@ -752,98 +956,158 @@ share/httpd/manual/new_features_2_0.html.ru.koi8-r
 share/httpd/manual/new_features_2_0.xml
 share/httpd/manual/new_features_2_0.xml.de
 share/httpd/manual/new_features_2_0.xml.ja
+share/httpd/manual/new_features_2_0.xml.ko
+share/httpd/manual/new_features_2_0.xml.meta
 share/httpd/manual/new_features_2_0.xml.ru
 share/httpd/manual/platform/ebcdic.html.en
 share/httpd/manual/platform/ebcdic.xml
-share/httpd/manual/platform/footer.html
-share/httpd/manual/platform/header.html
+share/httpd/manual/platform/ebcdic.xml.meta
 share/httpd/manual/platform/index.html.en
 share/httpd/manual/platform/index.xml
+share/httpd/manual/platform/index.xml.meta
 share/httpd/manual/platform/netware.html.en
 share/httpd/manual/platform/netware.xml
+share/httpd/manual/platform/netware.xml.meta
 share/httpd/manual/platform/perf-hp.html.en
 share/httpd/manual/platform/perf-hp.xml
+share/httpd/manual/platform/perf-hp.xml.meta
 share/httpd/manual/platform/win_compiling.html.en
 share/httpd/manual/platform/win_compiling.xml
+share/httpd/manual/platform/win_compiling.xml.meta
 share/httpd/manual/platform/windows.html.en
 share/httpd/manual/platform/windows.xml
-share/httpd/manual/programs/ab.html
+share/httpd/manual/platform/windows.xml.meta
+share/httpd/manual/programs/ab.html.en
+share/httpd/manual/programs/ab.xml
+share/httpd/manual/programs/ab.xml.meta
 share/httpd/manual/programs/apachectl.html.en
 share/httpd/manual/programs/apachectl.xml
-share/httpd/manual/programs/apxs.html
-share/httpd/manual/programs/dbmmanage.html
-share/httpd/manual/programs/footer.html
-share/httpd/manual/programs/header.html
-share/httpd/manual/programs/htdigest.html
-share/httpd/manual/programs/htpasswd.html
+share/httpd/manual/programs/apachectl.xml.meta
+share/httpd/manual/programs/apxs.html.en
+share/httpd/manual/programs/apxs.xml
+share/httpd/manual/programs/apxs.xml.meta
+share/httpd/manual/programs/dbmmanage.html.en
+share/httpd/manual/programs/dbmmanage.xml
+share/httpd/manual/programs/dbmmanage.xml.meta
+share/httpd/manual/programs/htdigest.html.en
+share/httpd/manual/programs/htdigest.xml
+share/httpd/manual/programs/htdigest.xml.meta
+share/httpd/manual/programs/htpasswd.html.en
+share/httpd/manual/programs/htpasswd.xml
+share/httpd/manual/programs/htpasswd.xml.meta
 share/httpd/manual/programs/httpd.html.en
 share/httpd/manual/programs/httpd.xml
+share/httpd/manual/programs/httpd.xml.meta
 share/httpd/manual/programs/index.html.en
 share/httpd/manual/programs/index.xml
-share/httpd/manual/programs/logresolve.html
-share/httpd/manual/programs/other.html
-share/httpd/manual/programs/rotatelogs.html
-share/httpd/manual/programs/suexec.html
+share/httpd/manual/programs/index.xml.meta
+share/httpd/manual/programs/logresolve.html.en
+share/httpd/manual/programs/logresolve.xml
+share/httpd/manual/programs/logresolve.xml.meta
+share/httpd/manual/programs/other.html.en
+share/httpd/manual/programs/other.xml
+share/httpd/manual/programs/other.xml.meta
+share/httpd/manual/programs/rotatelogs.html.en
+share/httpd/manual/programs/rotatelogs.xml
+share/httpd/manual/programs/rotatelogs.xml.meta
+share/httpd/manual/programs/suexec.html.en
+share/httpd/manual/programs/suexec.xml
+share/httpd/manual/programs/suexec.xml.meta
 share/httpd/manual/search/manual-index.cgi
 share/httpd/manual/sections.html.en
 share/httpd/manual/sections.html.ja.jis
+share/httpd/manual/sections.html.ko.euc-kr
 share/httpd/manual/sections.xml
 share/httpd/manual/sections.xml.ja
+share/httpd/manual/sections.xml.ko
+share/httpd/manual/sections.xml.meta
 share/httpd/manual/server-wide.html.en
 share/httpd/manual/server-wide.html.ja.jis
+share/httpd/manual/server-wide.html.ko.euc-kr
 share/httpd/manual/server-wide.xml
 share/httpd/manual/server-wide.xml.ja
+share/httpd/manual/server-wide.xml.ko
+share/httpd/manual/server-wide.xml.meta
 share/httpd/manual/sitemap.html.de
 share/httpd/manual/sitemap.html.en
 share/httpd/manual/sitemap.html.ja.jis
+share/httpd/manual/sitemap.html.ko.euc-kr
 share/httpd/manual/sitemap.xml
 share/httpd/manual/sitemap.xml.de
 share/httpd/manual/sitemap.xml.ja
-share/httpd/manual/ssl/footer.html
-share/httpd/manual/ssl/header.html
+share/httpd/manual/sitemap.xml.ko
+share/httpd/manual/sitemap.xml.meta
 share/httpd/manual/ssl/index.html.en
 share/httpd/manual/ssl/index.html.ja.jis
 share/httpd/manual/ssl/index.xml
 share/httpd/manual/ssl/index.xml.ja
+share/httpd/manual/ssl/index.xml.meta
 share/httpd/manual/ssl/ssl_compat.html.en
 share/httpd/manual/ssl/ssl_compat.xml
-share/httpd/manual/ssl/ssl_cover_logo.jpg
-share/httpd/manual/ssl/ssl_cover_title.jpg
+share/httpd/manual/ssl/ssl_compat.xml.meta
 share/httpd/manual/ssl/ssl_faq.html.en
 share/httpd/manual/ssl/ssl_faq.xml
+share/httpd/manual/ssl/ssl_faq.xml.meta
 share/httpd/manual/ssl/ssl_howto.html.en
 share/httpd/manual/ssl/ssl_howto.xml
+share/httpd/manual/ssl/ssl_howto.xml.meta
 share/httpd/manual/ssl/ssl_intro.html.en
 share/httpd/manual/ssl/ssl_intro.xml
+share/httpd/manual/ssl/ssl_intro.xml.meta
 share/httpd/manual/ssl/ssl_intro_fig1.gif
 share/httpd/manual/ssl/ssl_intro_fig2.gif
 share/httpd/manual/ssl/ssl_intro_fig3.gif
 share/httpd/manual/ssl/ssl_overview_fig1.gif
-share/httpd/manual/ssl/ssl_template.imgdot-1x1-000000.gif
-share/httpd/manual/ssl/ssl_template.imgdot-1x1-transp.gif
 share/httpd/manual/stopping.html.de
 share/httpd/manual/stopping.html.en
 share/httpd/manual/stopping.html.ja.jis
+share/httpd/manual/stopping.html.ko.euc-kr
 share/httpd/manual/stopping.html.ru.koi8-r
 share/httpd/manual/stopping.xml
 share/httpd/manual/stopping.xml.de
 share/httpd/manual/stopping.xml.ja
+share/httpd/manual/stopping.xml.ko
+share/httpd/manual/stopping.xml.meta
 share/httpd/manual/stopping.xml.ru
+share/httpd/manual/style/chm/chm.de.xsl
+share/httpd/manual/style/chm/chm.en.xsl
+share/httpd/manual/style/chm/chm.ja.xsl
+share/httpd/manual/style/chm/chm.ko.xsl
+share/httpd/manual/style/chm/chm.zh-cn.xsl
+share/httpd/manual/style/chm/hhc.de.xsl
+share/httpd/manual/style/chm/hhc.en.xsl
+share/httpd/manual/style/chm/hhc.ja.xsl
+share/httpd/manual/style/chm/hhc.ko.xsl
+share/httpd/manual/style/chm/hhc.xsl
+share/httpd/manual/style/chm/hhc.zh-cn.xsl
+share/httpd/manual/style/chm/hhp.de.xsl
+share/httpd/manual/style/chm/hhp.en.xsl
+share/httpd/manual/style/chm/hhp.ja.xsl
+share/httpd/manual/style/chm/hhp.ko.xsl
+share/httpd/manual/style/chm/hhp.xsl
+share/httpd/manual/style/chm/hhp.zh-cn.xsl
 share/httpd/manual/style/common.dtd
+share/httpd/manual/style/css/manual-chm.css
 share/httpd/manual/style/css/manual-loose-100pc.css
 share/httpd/manual/style/css/manual-print.css
 share/httpd/manual/style/css/manual.css
+share/httpd/manual/style/faq.dtd
 share/httpd/manual/style/lang/de.xml
 share/httpd/manual/style/lang/en.xml
 share/httpd/manual/style/lang/ja.xml
+share/httpd/manual/style/lang/ko.xml
 share/httpd/manual/style/lang/ru.xml
 share/httpd/manual/style/lang/sv.xml
+share/httpd/manual/style/man/man.en.xsl
+share/httpd/manual/style/man/manpage.xsl
 share/httpd/manual/style/manual.de.xsl
 share/httpd/manual/style/manual.en.xsl
 share/httpd/manual/style/manual.ja.xsl
+share/httpd/manual/style/manual.ko.xsl
 share/httpd/manual/style/manual.pt-br.xsl
 share/httpd/manual/style/manual.ru.xsl
 share/httpd/manual/style/manual.sv.xsl
+share/httpd/manual/style/manual.zh-cn.xsl
 share/httpd/manual/style/manualpage.dtd
 share/httpd/manual/style/modulesynopsis.dtd
 share/httpd/manual/style/sitemap.dtd
@@ -854,15 +1118,28 @@ share/httpd/manual/style/w3c/xhtml1-strict.dtd
 share/httpd/manual/style/w3c/xhtml1-transitional.dtd
 share/httpd/manual/style/xsl/common.xsl
 share/httpd/manual/style/xsl/directiveindex.xsl
+share/httpd/manual/style/xsl/faq.xsl
+share/httpd/manual/style/xsl/indexpage.xsl
 share/httpd/manual/style/xsl/manualpage.xsl
 share/httpd/manual/style/xsl/moduleindex.xsl
 share/httpd/manual/style/xsl/quickreference.xsl
 share/httpd/manual/style/xsl/sitemap.xsl
 share/httpd/manual/style/xsl/synopsis.xsl
+share/httpd/manual/style/xsl/util/lf.xml
+share/httpd/manual/style/xsl/util/li-end.xml
+share/httpd/manual/style/xsl/util/li-start.xml
+share/httpd/manual/style/xsl/util/modtrans.xsl
+share/httpd/manual/style/xsl/util/nbsp.xml
+share/httpd/manual/style/xsl/util/tab.xml
+share/httpd/manual/style/xsl/util/ul-end.xml
+share/httpd/manual/style/xsl/util/ul-start.xml
 share/httpd/manual/suexec.html.en
 share/httpd/manual/suexec.html.ja.jis
+share/httpd/manual/suexec.html.ko.euc-kr
 share/httpd/manual/suexec.xml
 share/httpd/manual/suexec.xml.ja
+share/httpd/manual/suexec.xml.ko
+share/httpd/manual/suexec.xml.meta
 share/httpd/manual/upgrading.html.de
 share/httpd/manual/upgrading.html.en
 share/httpd/manual/upgrading.html.fr
@@ -872,32 +1149,58 @@ share/httpd/manual/upgrading.html.ru.koi8-r
 share/httpd/manual/upgrading.xml
 share/httpd/manual/upgrading.xml.de
 share/httpd/manual/upgrading.xml.ja
+share/httpd/manual/upgrading.xml.ko
+share/httpd/manual/upgrading.xml.meta
 share/httpd/manual/upgrading.xml.ru
 share/httpd/manual/urlmapping.html.en
 share/httpd/manual/urlmapping.html.ja.jis
+share/httpd/manual/urlmapping.html.ko.euc-kr
 share/httpd/manual/urlmapping.xml
 share/httpd/manual/urlmapping.xml.ja
+share/httpd/manual/urlmapping.xml.ko
+share/httpd/manual/urlmapping.xml.meta
 share/httpd/manual/vhosts/details.html.en
+share/httpd/manual/vhosts/details.html.ko.euc-kr
 share/httpd/manual/vhosts/details.xml
+share/httpd/manual/vhosts/details.xml.ko
+share/httpd/manual/vhosts/details.xml.meta
 share/httpd/manual/vhosts/examples.html.en
+share/httpd/manual/vhosts/examples.html.ko.euc-kr
 share/httpd/manual/vhosts/examples.xml
+share/httpd/manual/vhosts/examples.xml.ko
+share/httpd/manual/vhosts/examples.xml.meta
 share/httpd/manual/vhosts/fd-limits.html.en
 share/httpd/manual/vhosts/fd-limits.html.ja.jis
+share/httpd/manual/vhosts/fd-limits.html.ko.euc-kr
 share/httpd/manual/vhosts/fd-limits.xml
 share/httpd/manual/vhosts/fd-limits.xml.ja
-share/httpd/manual/vhosts/footer.html
-share/httpd/manual/vhosts/header.html
+share/httpd/manual/vhosts/fd-limits.xml.ko
+share/httpd/manual/vhosts/fd-limits.xml.meta
+share/httpd/manual/vhosts/index.html.de
 share/httpd/manual/vhosts/index.html.en
 share/httpd/manual/vhosts/index.html.ja.jis
+share/httpd/manual/vhosts/index.html.ko.euc-kr
 share/httpd/manual/vhosts/index.xml
+share/httpd/manual/vhosts/index.xml.de
 share/httpd/manual/vhosts/index.xml.ja
+share/httpd/manual/vhosts/index.xml.ko
+share/httpd/manual/vhosts/index.xml.meta
 share/httpd/manual/vhosts/ip-based.html.en
+share/httpd/manual/vhosts/ip-based.html.ko.euc-kr
 share/httpd/manual/vhosts/ip-based.xml
+share/httpd/manual/vhosts/ip-based.xml.ko
+share/httpd/manual/vhosts/ip-based.xml.meta
 share/httpd/manual/vhosts/mass.html.en
+share/httpd/manual/vhosts/mass.html.ko.euc-kr
 share/httpd/manual/vhosts/mass.xml
+share/httpd/manual/vhosts/mass.xml.ko
+share/httpd/manual/vhosts/mass.xml.meta
 share/httpd/manual/vhosts/name-based.html.en
 share/httpd/manual/vhosts/name-based.html.ja.jis
+share/httpd/manual/vhosts/name-based.html.ko.euc-kr
 share/httpd/manual/vhosts/name-based.xml
+share/httpd/manual/vhosts/name-based.xml.ko
+share/httpd/manual/vhosts/name-based.xml.meta
 @dirrm share/httpd/manual/developer
 @dirrm share/httpd/manual/faq
 @dirrm share/httpd/manual/howto
@@ -908,10 +1211,13 @@ share/httpd/manual/vhosts/name-based.xml
 @dirrm share/httpd/manual/programs
 @dirrm share/httpd/manual/search
 @dirrm share/httpd/manual/ssl
+@dirrm share/httpd/manual/style/xsl/util
 @dirrm share/httpd/manual/style/xsl
 @dirrm share/httpd/manual/style/w3c
+@dirrm share/httpd/manual/style/man
 @dirrm share/httpd/manual/style/lang
 @dirrm share/httpd/manual/style/css
+@dirrm share/httpd/manual/style/chm
 @dirrm share/httpd/manual/style
 @dirrm share/httpd/manual/vhosts
 @dirrm share/httpd/manual
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index fd83a7fe802..b8527656e69 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.19 2003/05/25 09:02:38 epg Exp $
+$NetBSD: distinfo,v 1.20 2003/05/29 01:02:29 itojun Exp $
 
-SHA1 (httpd-2.0.45.tar.gz) = f722399b0e1986e699bc807518e396b7f0286cca
-Size (httpd-2.0.45.tar.gz) = 5549120 bytes
-SHA1 (patch-aa) = b0632ed8e7fba4b5b36407b67bfe2faf3234e575
+SHA1 (httpd-2.0.46.tar.gz) = c739c4c296054697e264f7d1ac19f9f1e2d47553
+Size (httpd-2.0.46.tar.gz) = 6031023 bytes
+SHA1 (patch-aa) = 2b7a2c0db5abac66966eaea2efb8609843e8abf4
 SHA1 (patch-ad) = e4a0c729ce5fbf43855ea080946052ef025334f1
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
 SHA1 (patch-ah) = f655dbabb32884a20e77f4791fa762e6c0e6cf74
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
 SHA1 (patch-al) = 29cc52616c50b7ec998339cca386112a8f1611cc
 SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426
-SHA1 (patch-ar) = 5e4010b2b48c9a19c1cbade9baab639a9e31704d
+SHA1 (patch-ar) = de5f57dd0757b7fdc1039c00f6e18de72007f5d8
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index afb217301a4..b915194969c 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2003/05/25 08:58:10 epg Exp $
+$NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $
 
---- Makefile.in.orig	Mon Sep 30 10:34:40 2002
-+++ Makefile.in
-@@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
+--- Makefile.in.orig	2003-05-18 02:11:37.000000000 +0900
++++ Makefile.in	2003-05-29 09:48:23.000000000 +0900
+@@ -14,7 +14,7 @@
  PROGRAMS        = $(PROGRAM_NAME)
  TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
  PHONY_TARGETS   = $(srcdir)/buildmark.c
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.9 2003/05/25 08:58:10 epg Exp $
  	install-other install-cgi install-include install-suexec install-man \
  	install-build
  
-@@ -71,6 +71,7 @@ install-conf:
+@@ -71,6 +71,7 @@
  	    				< $$i; \
  	    		fi \
  	    	) > $(DESTDIR)$(sysconfdir)/$$i; \
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.9 2003/05/25 08:58:10 epg Exp $
  	    	chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
  	    	file=`echo $$i|sed s/-std//`; \
  	    	if [ "$$file" = "httpd.conf" ]; then \
-@@ -79,21 +80,22 @@ install-conf:
+@@ -79,13 +80,16 @@
  	    	if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
  	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  	    	fi; \
@@ -36,15 +36,16 @@ $NetBSD: patch-aa,v 1.9 2003/05/25 08:58:10 epg Exp $
  	fi
  
  install-build:
- 	@echo Installing build system files 
+@@ -93,8 +97,6 @@
  	@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
- 	@cp build/*.mk $(DESTDIR)$(installbuilddir); \
+ 	@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
+ 	cp build/*.mk $(DESTDIR)$(installbuilddir); \
 -	sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
 -	    build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
  	cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir);
  
  htdocs-srcdir = $(top_srcdir)/docs/docroot
-@@ -106,7 +108,7 @@ dox::
+@@ -107,7 +109,7 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -53,7 +54,7 @@ $NetBSD: patch-aa,v 1.9 2003/05/25 08:58:10 epg Exp $
             echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
          else \
  	    echo Installing HTML documents ; \
-@@ -116,7 +118,7 @@ install-htdocs:
+@@ -117,7 +119,7 @@
  	fi
  
  install-error:
@@ -62,7 +63,7 @@ $NetBSD: patch-aa,v 1.9 2003/05/25 08:58:10 epg Exp $
             echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
          else \
  	    echo Installing error documents ; \
-@@ -126,7 +128,7 @@ install-error:
+@@ -127,7 +129,7 @@
  	fi
  
  install-icons:
@@ -71,7 +72,7 @@ $NetBSD: patch-aa,v 1.9 2003/05/25 08:58:10 epg Exp $
             echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
          else \
  	    echo Installing icons ; \
-@@ -136,7 +138,7 @@ install-icons:
+@@ -137,7 +139,7 @@
  	fi
  
  install-cgi:
diff --git a/www/apache2/patches/patch-ar b/www/apache2/patches/patch-ar
index e6f017a81ac..50f539e636b 100644
--- a/www/apache2/patches/patch-ar
+++ b/www/apache2/patches/patch-ar
@@ -1,13 +1,13 @@
-$NetBSD: patch-ar,v 1.1 2003/04/15 11:49:38 martin Exp $
+$NetBSD: patch-ar,v 1.2 2003/05/29 01:02:29 itojun Exp $
 
---- srclib/apr/include/apr_atomic.h.orig	2003-04-15 13:21:18.000000000 +0200
-+++ srclib/apr/include/apr_atomic.h	2003-04-15 13:22:01.000000000 +0200
-@@ -247,7 +247,7 @@
- #define apr_atomic_read(mem)        (*(mem))
- #define apr_atomic_init(pool)        APR_SUCCESS
+--- srclib/apr/include/apr_atomic.h.orig	2003-05-03 13:11:07.000000000 +0900
++++ srclib/apr/include/apr_atomic.h	2003-05-29 09:50:00.000000000 +0900
+@@ -211,7 +211,7 @@
+ #define apr_atomic_set(mem, val)     atomic_set_int(mem, val)
+ #define apr_atomic_read(mem)         (*mem)
  
--#elif (defined(__sparc__) || defined(sparc)) && !APR_FORCE_ATOMIC_GENERIC
-+#elif !defined(__NetBSD__) && ((defined(__sparc__) || defined(sparc))) && !APR_FORCE_ATOMIC_GENERIC
+-#elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
++#elif !defined(__NetBSD__) && (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
  
  #define apr_atomic_t apr_uint32_t
- #define apr_atomic_read(p)  *p
+ #define apr_atomic_cas(mem,with,cmp) \