Update apache to 1.3.22. Relevant changes from version 1.3.20 include

using the pkgsrc expat library instead of the builtin one (this is to
avoid conflicts between expat libraries when an expat XML parser is loaded
by either mod_perl or mod_php), and:

  Security vulnerabilities

     * A vulnerability was found in the split-logfile support program. A
       request with a specially crafted Host: header could allow any file
       with a .log extension on the system to be written to.
     * A vulnerability was found when Multiviews are used to negotiate
       the directory index. In some configurations, requesting a URI with
       a QUERY_STRING of M=D could return a directory listing rather than
       the expected index page.

  General bug fixes and improvements

     * Bug fixes
     * The supplied icons are now also distributed in PNG format
     * New directives have been added to the mod_usertrack module, The
       first, CookieDomain, can be used to customise the Domain
       attribute.
     * A new directive, AcceptMutex, allows run-time configuration of the
       mutex type used for accept serialization.
     * mod_auth has been enhanced to allow access to a document to be
       controlled based on the owner of the file being served.
     * A new directive, AcceptFilter, has been added to control BSD
       accept filters at run-time. The functionality can postpone the
       requirement for a child process to handle a new connection until
       an HTTP request has arrived, therefore increasing the number of
       connections that a given number of child processes can handle

8 files changed, 213 insertions, 75 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 3c80e1c97dd..01ca7de5faf 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.77 2001/10/16 04:11:06 jlam Exp $
+# $NetBSD: Makefile,v 1.78 2001/10/17 19:17:00 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
-DISTNAME=		apache_1.3.20
-PKGNAME=		apache-1.3.20nb1
+DISTNAME=		apache_1.3.22
+PKGNAME=		apache-1.3.22
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
 			http://www.apache.de/dist/httpd/ \
@@ -15,7 +15,7 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 MASTER_SITES+=		http://www.modssl.org/source/ \
 			ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/source/
 DISTFILES+=		${MODSSL_DISTNAME}${EXTRACT_SUFX}
-MODSSL_DISTNAME=	mod_ssl-2.8.4-1.3.20
+MODSSL_DISTNAME=	mod_ssl-2.8.5-1.3.22
 MODSSL_SRC=		${WRKDIR}/${MODSSL_DISTNAME}
 
 MAINTAINER=		jlam@netbsd.org
@@ -25,7 +25,8 @@ COMMENT=		HTTP (Web) server
 CONFLICTS=		apache-*modssl-[0-9]* apache6-[0-9]*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
-HAS_CONFIGURE=		# defined
+USE_BUILDLINK_ONLY=	YES
+HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-layout="${WRKDIR}/config.layout:pkgsrc"
 CONFIGURE_ARGS+=	--enable-module=most				\
 			--enable-module=auth_db				\
@@ -86,11 +87,11 @@ MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 .endif
 
 .if (${OPSYS} == "SunOS")
-DEPENDS+=		db-2.7.7:../../databases/db
-LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib			\
-			-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
-CONFIGURE_ENV+=		INCLUDES="-I${LOCALBASE}/include/db2"
+LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib
+CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_DIR}/include/db2"
 CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
+BUILDLINK_DEPENDS.db=	db>=2.7.7
+.include "../../databases/db/buildlink.mk"
 .endif
 
 BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS
@@ -159,4 +160,5 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../textproc/expat/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/distinfo b/www/apache/distinfo
index 3c95512b216..c95a821dcac 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.6 2001/10/16 04:11:06 jlam Exp $
+$NetBSD: distinfo,v 1.7 2001/10/17 19:17:00 jlam Exp $
 
-SHA1 (apache_1.3.20.tar.gz) = c791b6513b253035c04e76f4e1882ad847134a12
-Size (apache_1.3.20.tar.gz) = 1973138 bytes
+SHA1 (apache_1.3.22.tar.gz) = 5b93c1f8c8cfb703e6082ffa2cd99ea017e1e05e
+Size (apache_1.3.22.tar.gz) = 2177983 bytes
 SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
-SHA1 (mod_ssl-2.8.4-1.3.20.tar.gz) = 11114eedd0bc77309ce732b250ccbfbe32060616
-Size (mod_ssl-2.8.4-1.3.20.tar.gz) = 751936 bytes
-SHA1 (patch-aa) = aed136dfee27b1fe98892d669d218c1070782b5e
+SHA1 (mod_ssl-2.8.5-1.3.22.tar.gz) = 432be249fbaa3a87391b50af7b138c5496fac209
+Size (mod_ssl-2.8.5-1.3.22.tar.gz) = 751863 bytes
+SHA1 (patch-aa) = 2c6b30c72e23089724ff5bf0b76a031dc7575411
 SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd
 SHA1 (patch-ad) = 79e9b2adb23e412195f0382b30b56496af735297
-SHA1 (patch-ae) = 29e1da736d6948d550039cc4ddd1e7743e7e0feb
-SHA1 (patch-af) = 3396cbc389cdaad64573e8d99d1a2613a1e5915e
+SHA1 (patch-ae) = 037e24a3019025f031172af0102f043ddf2f0556
+SHA1 (patch-af) = ce65ab33ca9996f58cc9c212c565ef4af00bf066
 SHA1 (patch-ag) = 5586719f7fa7b5d670d2735e487943c046533ea6
 SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3
 SHA1 (patch-ai) = a5e66d9e64aa2fe59dc2a2186ae169bcb8e5e071
-SHA1 (patch-aj) = 9070bd6b504701432302ef89a84b9270e646f833
+SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100
 SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955
diff --git a/www/apache/files/config.layout b/www/apache/files/config.layout
index f35b0b74bce..81d1cbe443a 100644
--- a/www/apache/files/config.layout
+++ b/www/apache/files/config.layout
@@ -1,4 +1,4 @@
-# $NetBSD: config.layout,v 1.2 2001/04/14 19:42:54 kim Exp $
+# $NetBSD: config.layout,v 1.3 2001/10/17 19:17:00 jlam Exp $
 
 <Layout pkgsrc>
 prefix: @PREFIX@
@@ -11,6 +11,7 @@ sysconfdir: @APACHE_SYSCONFDIR@
 datadir: ${prefix}/share/httpd
 iconsdir: ${prefix}/share/httpd/icons
 htdocsdir: ${prefix}/share/httpd/htdocs
+manualdir: ${prefix}/share/httpd/htdocs/manual
 cgidir: ${exec_prefix}/libexec/cgi-bin
 includedir: ${prefix}/include/httpd
 localstatedir: /var/run
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index b713d3afe69..35d00f36472 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2001/02/02 16:39:57 jlam Exp $
+$NetBSD: patch-aa,v 1.15 2001/10/17 19:17:00 jlam Exp $
 
---- Makefile.tmpl.orig	Fri Feb  2 00:42:14 2001
+--- Makefile.tmpl.orig	Wed Oct 17 11:47:02 2001
 +++ Makefile.tmpl
-@@ -385,34 +385,6 @@
+@@ -387,34 +387,6 @@
  			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
  			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
  			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
@@ -37,18 +37,18 @@ $NetBSD: patch-aa,v 1.14 2001/02/02 16:39:57 jlam Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -538,15 +510,16 @@
- 		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
- 		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+@@ -547,15 +519,16 @@
+ 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
+ 		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
  	fi
 -	-@if [ -f $(root)$(cgidir)/printenv ]; then \
 +	-@if false; then \
- 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+ 		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
  	else \
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
-+			-e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
++			    -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
  			> $(TOP)/$(SRC)/.apaci.install.tmp; \
 -			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
 -			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.14 2001/02/02 16:39:57 jlam Exp $
  		done; \
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
-@@ -560,7 +533,7 @@
+@@ -569,7 +542,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
diff --git a/www/apache/patches/patch-ae b/www/apache/patches/patch-ae
index 2b30244c0f9..d5af8755560 100644
--- a/www/apache/patches/patch-ae
+++ b/www/apache/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2001/03/13 20:52:28 jlam Exp $
+$NetBSD: patch-ae,v 1.6 2001/10/17 19:17:00 jlam Exp $
 
---- src/modules/standard/mod_include.c.orig	Fri Feb 23 11:37:26 2001
+--- src/modules/standard/mod_include.c.orig	Thu Sep 20 23:51:54 2001
 +++ src/modules/standard/mod_include.c
 @@ -93,7 +93,11 @@
  #include "http_log.h"
@@ -71,7 +71,7 @@ $NetBSD: patch-ae,v 1.5 2001/03/13 20:52:28 jlam Exp $
  
  
  /* -------------------------- The main function --------------------------- */
-@@ -2286,6 +2304,13 @@
+@@ -2300,6 +2318,13 @@
              }
  #endif
              else {
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af
index 7668e264fbf..0858d63590d 100644
--- a/www/apache/patches/patch-af
+++ b/www/apache/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.7 2001/02/02 16:39:57 jlam Exp $
+$NetBSD: patch-af,v 1.8 2001/10/17 19:17:00 jlam Exp $
 
---- src/modules/standard/mod_so.c.orig	Fri Feb  2 00:42:13 2001
+--- src/modules/standard/mod_so.c.orig	Wed Oct 17 11:47:02 2001
 +++ src/modules/standard/mod_so.c
-@@ -318,7 +318,15 @@
+@@ -321,7 +321,15 @@
          return err;
      }
      
diff --git a/www/apache/patches/patch-aj b/www/apache/patches/patch-aj
index 81470ce5d35..5d9c5725ad0 100644
--- a/www/apache/patches/patch-aj
+++ b/www/apache/patches/patch-aj
@@ -1,36 +1,37 @@
-$NetBSD: patch-aj,v 1.6 2001/06/09 06:36:44 jlam Exp $
+$NetBSD: patch-aj,v 1.7 2001/10/17 19:17:00 jlam Exp $
 
---- htdocs/index.html.fr.orig	Tue May  1 06:31:10 2001
-+++ htdocs/index.html.fr	Sat Jun  9 01:48:28 2001
-@@ -36,12 +36,27 @@
- <HR WIDTH="50%" SIZE="8">
+--- htdocs/index.html.fr.orig	Wed Jun 27 08:38:39 2001
++++ htdocs/index.html.fr	Tue Oct 16 22:29:50 2001
+@@ -36,12 +36,28 @@
+ <hr width="50%" size="8">
  
- <p>La <A HREF="manual/">documentation</A> Apache est incluse dans cette
+ <p>La <a href="manual/">documentation</a> Apache est incluse dans cette
 -distribution.</p>
 +distribution. Si l'extension SSL <STRONG>mod_ssl</STRONG> a \xe9t\xe9
 +install\xe9e, lisez alors attentivement la 
-+<A HREF="manual/mod/mod_ssl/index.html">documentation SSL</A>.</p>
- 
--<p>Le webmaster de ce site peut librement utiliser l'image ci-dessous sur un
--site web utilisant le logiciel Apache. Merci d'avoir choisi Apache&nbsp;!</p>
++<a href="manual/mod/mod_ssl/index.html">documentation SSL</a>.</p>
++  
 +<p>Des informations sur le syst\xe8me d'exploitation multi-plateforme NetBSD
 +peuvent &ecirc;tre trouv\xe9es sur
-+<A HREF="http://www.netbsd.org/">la homepage du projet NetBSD</A>.</p> 
++<a href="http://www.netbsd.org/">la homepage du projet NetBSD</a>.</p> 
++  
++<p>Le webmaster de ce site peut librement utiliser les images ci-dessous sur u
  
--<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
-+<p>Le webmaster de ce site peut librement utiliser les images ci-dessous sur un
+-<p>Le webmaster de ce site peut librement utiliser l'image ci-dessous sur un
+-site web utilisant le logiciel Apache. Merci d'avoir choisi Apache&nbsp;!</p>
 +site web utilisant les logiciels Apache et NetBSD. Merci d'avoir choisi
-+<A HREF="http://www.apache.org/">Apache</A> sur
-+<A HREF="http://www.netbsd.org/">NetBSD</A>&nbsp;!</p>
-+
-+<DIV ALIGN="CENTER">
-+ <A HREF="http://www.apache.org/">
-+  <IMG SRC="apache_pb.gif" BORDER="0" ALT="Powered by Apache">
-+ </A>
-+ <A HREF="http://www.netbsd.org/">
-+  <IMG SRC="sitedrivenby.gif" BORDER="0" ALT="Site driven by NetBSD">
-+ </A>
-+</DIV>
++<a href="http://www.apache.org/">Apache</a> sur
++<a href="http://www.netbsd.org/">NetBSD</a>&nbsp;!</p>
+ 
+-<div align="CENTER"><img src="apache_pb.gif" alt=""></div>
++<div align="CENTER">
++ <a href="http://www.apache.org/">
++  <img src="apache_pb.gif" BORDER="0" alt="Powered by Apache">
++ </a>
++ <a href="http://www.netbsd.org/">
++  <img src="sitedrivenby.gif" BORDER="0" alt="Site driven by NetBSD">
++ </a>
++</div>
  
- </BODY>
- </HTML>
+ </body>
+ </html>
diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST
index d75b44bdd6e..a16da050803 100644
--- a/www/apache/pkg/PLIST
+++ b/www/apache/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2001/06/09 06:36:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.23 2001/10/17 19:17:00 jlam Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -72,7 +72,6 @@ sbin/rotatelogs
 share/examples/httpd/httpd.conf.default
 share/examples/httpd/magic.default
 share/examples/httpd/mime.types.default
-share/httpd/htdocs/README.rus
 share/httpd/htdocs/apache_pb.gif
 share/httpd/htdocs/index.html.ca
 share/httpd/htdocs/index.html.cz
@@ -89,6 +88,7 @@ share/httpd/htdocs/index.html.ja.jis
 share/httpd/htdocs/index.html.kr.iso-kr
 share/httpd/htdocs/index.html.lu
 share/httpd/htdocs/index.html.nl
+share/httpd/htdocs/index.html.nn
 share/httpd/htdocs/index.html.no
 share/httpd/htdocs/index.html.po.iso-pl
 share/httpd/htdocs/index.html.pt
@@ -103,20 +103,30 @@ share/httpd/htdocs/index.html.ru.utf8
 share/httpd/htdocs/index.html.se
 share/httpd/htdocs/index.html.zh.Big5
 share/httpd/htdocs/manual/LICENSE
-share/httpd/htdocs/manual/bind.html
-share/httpd/htdocs/manual/cgi_path.html
+share/httpd/htdocs/manual/bind.html.en
+share/httpd/htdocs/manual/bind.html.fr
+share/httpd/htdocs/manual/bind.html.html
+share/httpd/htdocs/manual/cgi_path.html.en
+share/httpd/htdocs/manual/cgi_path.html.fr
+share/httpd/htdocs/manual/cgi_path.html.html
 share/httpd/htdocs/manual/configuring.html.en
 share/httpd/htdocs/manual/configuring.html.fr
 share/httpd/htdocs/manual/configuring.html.html
 share/httpd/htdocs/manual/configuring.html.ja.jis
 share/httpd/htdocs/manual/content-negotiation.html
 share/httpd/htdocs/manual/custom-error.html.en
+share/httpd/htdocs/manual/custom-error.html.fr
 share/httpd/htdocs/manual/custom-error.html.html
 share/httpd/htdocs/manual/custom-error.html.ja.jis
-share/httpd/htdocs/manual/dns-caveats.html
+share/httpd/htdocs/manual/cygwin.html
+share/httpd/htdocs/manual/dns-caveats.html.en
+share/httpd/htdocs/manual/dns-caveats.html.fr
+share/httpd/htdocs/manual/dns-caveats.html.html
 share/httpd/htdocs/manual/dso.html
 share/httpd/htdocs/manual/ebcdic.html
-share/httpd/htdocs/manual/env.html
+share/httpd/htdocs/manual/env.html.en
+share/httpd/htdocs/manual/env.html.html
+share/httpd/htdocs/manual/env.html.ja.jis
 share/httpd/htdocs/manual/footer.html
 share/httpd/htdocs/manual/handler.html.en
 share/httpd/htdocs/manual/handler.html.html
@@ -150,11 +160,14 @@ share/httpd/htdocs/manual/install.html.es
 share/httpd/htdocs/manual/install.html.fr
 share/httpd/htdocs/manual/install.html.html
 share/httpd/htdocs/manual/install.html.ja.jis
-share/httpd/htdocs/manual/invoking.html
+share/httpd/htdocs/manual/invoking.html.en
 share/httpd/htdocs/manual/invoking.html.fr
 share/httpd/htdocs/manual/invoking.html.html
-share/httpd/htdocs/manual/keepalive.html
+share/httpd/htdocs/manual/keepalive.html.en
+share/httpd/htdocs/manual/keepalive.html.html
+share/httpd/htdocs/manual/keepalive.html.ja.jis
 share/httpd/htdocs/manual/location.html
+share/httpd/htdocs/manual/logs.html
 share/httpd/htdocs/manual/man-template.html
 share/httpd/htdocs/manual/misc/API.html
 share/httpd/htdocs/manual/misc/FAQ.html
@@ -180,17 +193,27 @@ share/httpd/htdocs/manual/misc/security_tips.html
 share/httpd/htdocs/manual/misc/tutorials.html
 share/httpd/htdocs/manual/misc/vif-info.html
 share/httpd/htdocs/manual/misc/windoz_keepalive.html
-share/httpd/htdocs/manual/mod/core.html
+share/httpd/htdocs/manual/mod/core.html.en
+share/httpd/htdocs/manual/mod/core.html.fr
+share/httpd/htdocs/manual/mod/core.html.html
 share/httpd/htdocs/manual/mod/directive-dict.html.en
+share/httpd/htdocs/manual/mod/directive-dict.html.fr
 share/httpd/htdocs/manual/mod/directive-dict.html.html
 share/httpd/htdocs/manual/mod/directive-dict.html.ja.jis
-share/httpd/htdocs/manual/mod/directives.html
+share/httpd/htdocs/manual/mod/directives.html.de
+share/httpd/htdocs/manual/mod/directives.html.en
+share/httpd/htdocs/manual/mod/directives.html.fr
+share/httpd/htdocs/manual/mod/directives.html.html
+share/httpd/htdocs/manual/mod/directives.html.ja.jis
 share/httpd/htdocs/manual/mod/footer.html
 share/httpd/htdocs/manual/mod/header.html
-share/httpd/htdocs/manual/mod/index-bytype.html
+share/httpd/htdocs/manual/mod/index-bytype.html.en
 share/httpd/htdocs/manual/mod/index-bytype.html.fr
-share/httpd/htdocs/manual/mod/index.html
+share/httpd/htdocs/manual/mod/index-bytype.html.html
+share/httpd/htdocs/manual/mod/index.html.en
 share/httpd/htdocs/manual/mod/index.html.fr
+share/httpd/htdocs/manual/mod/index.html.html
+share/httpd/htdocs/manual/mod/index.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_access.html
 share/httpd/htdocs/manual/mod/mod_actions.html
 share/httpd/htdocs/manual/mod/mod_alias.html
@@ -281,7 +304,7 @@ share/httpd/htdocs/manual/server-wide.html.fr
 share/httpd/htdocs/manual/server-wide.html.html
 share/httpd/htdocs/manual/server-wide.html.ja.jis
 share/httpd/htdocs/manual/sourcereorg.html
-share/httpd/htdocs/manual/stopping.html
+share/httpd/htdocs/manual/stopping.html.en
 share/httpd/htdocs/manual/stopping.html.fr
 share/httpd/htdocs/manual/stopping.html.html
 share/httpd/htdocs/manual/suexec.html.en
@@ -303,122 +326,233 @@ share/httpd/htdocs/manual/vhosts/index.html.html
 share/httpd/htdocs/manual/vhosts/index.html.ja.jis
 share/httpd/htdocs/manual/vhosts/ip-based.html
 share/httpd/htdocs/manual/vhosts/mass.html
-share/httpd/htdocs/manual/vhosts/name-based.html
+share/httpd/htdocs/manual/vhosts/name-based.html.en
+share/httpd/htdocs/manual/vhosts/name-based.html.html
+share/httpd/htdocs/manual/vhosts/name-based.html.ja.jis
 share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html
 share/httpd/htdocs/manual/vhosts/virtual-host.html
 share/httpd/htdocs/manual/win_compiling.html
-share/httpd/htdocs/manual/win_service.html
+share/httpd/htdocs/manual/win_service.html.en
+share/httpd/htdocs/manual/win_service.html.html
+share/httpd/htdocs/manual/win_service.html.ja.jis
 share/httpd/htdocs/manual/windows.html
 share/httpd/htdocs/sitedrivenby.gif
 share/httpd/icons/README
 share/httpd/icons/a.gif
+share/httpd/icons/a.png
 share/httpd/icons/alert.black.gif
+share/httpd/icons/alert.black.png
 share/httpd/icons/alert.red.gif
+share/httpd/icons/alert.red.png
 share/httpd/icons/apache_pb.gif
+share/httpd/icons/apache_pb.png
 share/httpd/icons/back.gif
+share/httpd/icons/back.png
 share/httpd/icons/ball.gray.gif
+share/httpd/icons/ball.gray.png
 share/httpd/icons/ball.red.gif
+share/httpd/icons/ball.red.png
 share/httpd/icons/binary.gif
+share/httpd/icons/binary.png
 share/httpd/icons/binhex.gif
+share/httpd/icons/binhex.png
 share/httpd/icons/blank.gif
+share/httpd/icons/blank.png
 share/httpd/icons/bomb.gif
+share/httpd/icons/bomb.png
 share/httpd/icons/box1.gif
+share/httpd/icons/box1.png
 share/httpd/icons/box2.gif
+share/httpd/icons/box2.png
 share/httpd/icons/broken.gif
+share/httpd/icons/broken.png
 share/httpd/icons/burst.gif
+share/httpd/icons/burst.png
 share/httpd/icons/c.gif
+share/httpd/icons/c.png
 share/httpd/icons/comp.blue.gif
+share/httpd/icons/comp.blue.png
 share/httpd/icons/comp.gray.gif
+share/httpd/icons/comp.gray.png
 share/httpd/icons/compressed.gif
+share/httpd/icons/compressed.png
 share/httpd/icons/continued.gif
+share/httpd/icons/continued.png
 share/httpd/icons/dir.gif
+share/httpd/icons/dir.png
 share/httpd/icons/down.gif
+share/httpd/icons/down.png
 share/httpd/icons/dvi.gif
+share/httpd/icons/dvi.png
 share/httpd/icons/f.gif
+share/httpd/icons/f.png
 share/httpd/icons/folder.gif
 share/httpd/icons/folder.open.gif
+share/httpd/icons/folder.open.png
+share/httpd/icons/folder.png
 share/httpd/icons/folder.sec.gif
+share/httpd/icons/folder.sec.png
 share/httpd/icons/forward.gif
+share/httpd/icons/forward.png
 share/httpd/icons/generic.gif
+share/httpd/icons/generic.png
 share/httpd/icons/generic.red.gif
+share/httpd/icons/generic.red.png
 share/httpd/icons/generic.sec.gif
+share/httpd/icons/generic.sec.png
 share/httpd/icons/hand.right.gif
+share/httpd/icons/hand.right.png
 share/httpd/icons/hand.up.gif
+share/httpd/icons/hand.up.png
 share/httpd/icons/icon.sheet.gif
+share/httpd/icons/icon.sheet.png
 share/httpd/icons/image1.gif
+share/httpd/icons/image1.png
 share/httpd/icons/image2.gif
+share/httpd/icons/image2.png
 share/httpd/icons/image3.gif
+share/httpd/icons/image3.png
 share/httpd/icons/index.gif
+share/httpd/icons/index.png
 share/httpd/icons/layout.gif
+share/httpd/icons/layout.png
 share/httpd/icons/left.gif
+share/httpd/icons/left.png
 share/httpd/icons/link.gif
+share/httpd/icons/link.png
 share/httpd/icons/movie.gif
+share/httpd/icons/movie.png
 share/httpd/icons/p.gif
+share/httpd/icons/p.png
 share/httpd/icons/patch.gif
+share/httpd/icons/patch.png
 share/httpd/icons/pdf.gif
+share/httpd/icons/pdf.png
 share/httpd/icons/pie0.gif
+share/httpd/icons/pie0.png
 share/httpd/icons/pie1.gif
+share/httpd/icons/pie1.png
 share/httpd/icons/pie2.gif
+share/httpd/icons/pie2.png
 share/httpd/icons/pie3.gif
+share/httpd/icons/pie3.png
 share/httpd/icons/pie4.gif
+share/httpd/icons/pie4.png
 share/httpd/icons/pie5.gif
+share/httpd/icons/pie5.png
 share/httpd/icons/pie6.gif
+share/httpd/icons/pie6.png
 share/httpd/icons/pie7.gif
+share/httpd/icons/pie7.png
 share/httpd/icons/pie8.gif
+share/httpd/icons/pie8.png
 share/httpd/icons/portal.gif
+share/httpd/icons/portal.png
 share/httpd/icons/ps.gif
+share/httpd/icons/ps.png
 share/httpd/icons/quill.gif
+share/httpd/icons/quill.png
 share/httpd/icons/right.gif
+share/httpd/icons/right.png
 share/httpd/icons/screw1.gif
+share/httpd/icons/screw1.png
 share/httpd/icons/screw2.gif
+share/httpd/icons/screw2.png
 share/httpd/icons/script.gif
+share/httpd/icons/script.png
 share/httpd/icons/small/README.txt
 share/httpd/icons/small/back.gif
+share/httpd/icons/small/back.png
 share/httpd/icons/small/binary.gif
+share/httpd/icons/small/binary.png
 share/httpd/icons/small/binhex.gif
+share/httpd/icons/small/binhex.png
 share/httpd/icons/small/blank.gif
+share/httpd/icons/small/blank.png
 share/httpd/icons/small/broken.gif
+share/httpd/icons/small/broken.png
 share/httpd/icons/small/burst.gif
+share/httpd/icons/small/burst.png
 share/httpd/icons/small/comp1.gif
+share/httpd/icons/small/comp1.png
 share/httpd/icons/small/comp2.gif
+share/httpd/icons/small/comp2.png
 share/httpd/icons/small/compressed.gif
+share/httpd/icons/small/compressed.png
 share/httpd/icons/small/continued.gif
+share/httpd/icons/small/continued.png
 share/httpd/icons/small/dir.gif
+share/httpd/icons/small/dir.png
 share/httpd/icons/small/dir2.gif
+share/httpd/icons/small/dir2.png
 share/httpd/icons/small/doc.gif
+share/httpd/icons/small/doc.png
 share/httpd/icons/small/forward.gif
+share/httpd/icons/small/forward.png
 share/httpd/icons/small/generic.gif
+share/httpd/icons/small/generic.png
 share/httpd/icons/small/generic2.gif
+share/httpd/icons/small/generic2.png
 share/httpd/icons/small/generic3.gif
+share/httpd/icons/small/generic3.png
 share/httpd/icons/small/image.gif
+share/httpd/icons/small/image.png
 share/httpd/icons/small/image2.gif
+share/httpd/icons/small/image2.png
 share/httpd/icons/small/index.gif
+share/httpd/icons/small/index.png
 share/httpd/icons/small/key.gif
+share/httpd/icons/small/key.png
 share/httpd/icons/small/movie.gif
+share/httpd/icons/small/movie.png
 share/httpd/icons/small/patch.gif
+share/httpd/icons/small/patch.png
 share/httpd/icons/small/ps.gif
+share/httpd/icons/small/ps.png
 share/httpd/icons/small/rainbow.gif
+share/httpd/icons/small/rainbow.png
 share/httpd/icons/small/sound.gif
+share/httpd/icons/small/sound.png
 share/httpd/icons/small/sound2.gif
+share/httpd/icons/small/sound2.png
 share/httpd/icons/small/tar.gif
+share/httpd/icons/small/tar.png
 share/httpd/icons/small/text.gif
+share/httpd/icons/small/text.png
 share/httpd/icons/small/transfer.gif
+share/httpd/icons/small/transfer.png
 share/httpd/icons/small/unknown.gif
+share/httpd/icons/small/unknown.png
 share/httpd/icons/small/uu.gif
+share/httpd/icons/small/uu.png
 share/httpd/icons/sound1.gif
+share/httpd/icons/sound1.png
 share/httpd/icons/sound2.gif
+share/httpd/icons/sound2.png
 share/httpd/icons/sphere1.gif
+share/httpd/icons/sphere1.png
 share/httpd/icons/sphere2.gif
+share/httpd/icons/sphere2.png
 share/httpd/icons/tar.gif
+share/httpd/icons/tar.png
 share/httpd/icons/tex.gif
+share/httpd/icons/tex.png
 share/httpd/icons/text.gif
+share/httpd/icons/text.png
 share/httpd/icons/transfer.gif
+share/httpd/icons/transfer.png
 share/httpd/icons/unknown.gif
+share/httpd/icons/unknown.png
 share/httpd/icons/up.gif
+share/httpd/icons/up.png
 share/httpd/icons/uu.gif
+share/httpd/icons/uu.png
 share/httpd/icons/uuencoded.gif
+share/httpd/icons/uuencoded.png
 share/httpd/icons/world1.gif
+share/httpd/icons/world1.png
 share/httpd/icons/world2.gif
+share/httpd/icons/world2.png
 @dirrm share/httpd/icons/small
 @dirrm share/httpd/icons
 @dirrm share/httpd/htdocs/manual/vhosts