- Updated to Apache 1.3.22

- Updated the IPv6 patch

Apache 1.3.20 - 1.3.22 Major changes

  Security vulnerabilities

     * A vulnerability was found in the Win32 port of Apache 1.3.20.  A
       client submitting a very long URI could cause a directory listing
       to be returned rather than the default index page. A 403 Forbidden
       will now be returned.  CAN-2001-0729
     * 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. PR#7848
       CAN-2001-0730
     * 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.  CAN-2001-0731

     The security issues above have been assigned standardized names, CAN-
     by the Common Vulnerabilities and Exposures project (cve.mitre.org)

  New features

   The main new features in 1.3.22 (compared to 1.3.20) are:
     * The user manual has been updated. As well as a number of small
       fixes these updates include new translations into French and
       Japanese, a guide to using Apache httpd on Cygwin, a lexicon of
       Apache error messages, updated TPF documentation, and a
       comprehensive guide to using log files
     * The user manual can now be moved out of the htdocs DocumentRoot
       during installation by invoking configure with the --manualdir=
       switch, to allow separation of on-line docs from regular contents.
     * The supplied icons are now also distributed in PNG format
     * A significant overhaul to the Apache Bench program, ab has taken
       place, as first reported in April. The new Apache Bench includes
       fixes, additional statistics, csv and gnuplot output, and some
       SSL support
     * New directives have been added to the mod_usertrack module, The
       first, CookieDomain, can be used to customise the Domain
       attribute.  The patch to add the CookieDomain directive was first
       submitted over two years ago. Historically mod_usertrack has used
       the obsolete Netscape cookie syntax. The new CookieStyle directive
       allows use of the RFC2109 or RFC2965 syntax instead. PR#5023,
       PR#5920, PR#6140.
     * The server will now display a warning if line-end comments (#) are
       found in the configuration file. Not all directives are able to
       handle comments on the same line
     * A new directive, AcceptMutex, allows run-time configuration of the
       mutex type used for accept serialization, currently a compile-time
       only setting in 1.3. Since different types of mutex have different
       performance characteristics on different platforms, this directive
       will allow administrators to tune their Apache server more easily.
       The current list of possible methods is: uslock, pthread, sysvsem,
       fcntl, flock, os2sem, tpfcore, none. Not all platforms support all
       methods
     * mod_auth has been enhanced to allow access to a document to be
       controlled based on the owner of the file being served. Require
       file-owner will only allow files to be served where the
       authenticated username matches the user that owns the document.
       Require file-group works in a similar way checking that the group
       matches

   New features that relate to specific platforms:
     * A new directive, AcceptFilter, has been added to control BSD
       accept filters at run-time.  This should make it easier to move
       server binaries across different BSD machines without requiring
       recompilation.  Support for accept filters was first added to
       version 1.3.14, 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
     * On Win32 mod_unique_id, mod_mime_magic, and the mod_vhost_alias
       modules are now enabled
     * The Cygwin port includes a number of fixes and updates.  Cygwin
       support was first introduced in version 1.3.20
     * On Windows 2000, the service display names can now be modified
       by the user (use the service control panel applet)
     * On Win32 a new option -W can be used to set up a dependency on
       another service, see win_service.html
     * The server will now take advantage of recent improvements to the
       TPF operating system which include an enhanced system fork and
       exec, updates to allow non-blocking file descriptors, and an
       update to shutdown processing

  Bugs fixed

   The following bugs were found in Apache 1.3.20 and have been fixed in
   Apache 1.3.22:
     * Under certain circumstances a child may crash due to a bug in
       mod_include.  If a server uses an ErrorDocument for 404 (request
       not found) errors which points to a server-parsed HTML file which
       uses a <!--#include  virtual="file" --> section, then a request
       containing %2f will result in a segfault. The segfault is harmless
       and does not cause a security problem, but is being triggered by
       the recent IIS worm
     * The Multiviews functionality has been fixed to prevent
       mod_negotiation from serving any multiview variant that contains
       unknown filename extensions. PR#8130
     * Apache will prefer installed version of the Expat library over the
       bundled version. This fixes conflicts when multiple copies of the
       Expat library get loaded (notably when using mod_perl and
       XML::Parsers::Expat)
     * UnsetEnv now works from the main body of a configuration file.
       PR#8254
     * When used as a reverse proxy any headers set by other modules
       (such as mod_usertrack or mod_securid) now get passed on to the
       back-end server. PR#6055
     * Server response headers can now be logged via the proxy. PR#7461
     * mod_proxy will now pay attention to HTTP headers that specify the
       request is not to be cached. PR#5668
     * When a client making a request via mod_proxy died unexpectedly,
       mod_proxy did not close its connection. PR#8090
     * The CacheForceCompletion directive has been fixed PR#7383,
       PR#8067, PR#6585
     * A memory leak has been fixed in the mod_mime_magic module
     * A Satisfy All option has been added to the default container
       designed to stop access to .htaccess files.  Without this
       directive, these files could still be fetched if they were within
       the scope of a Satisfy Any directive.

   The following bugs relate to specific platforms:
     * A number of fixes for NetWare have been added. These include:
       enabling long file names in htpasswd and htdigest, protection
       against ill behaved modules, better handling of abnormal
       shutdowns, dealing with the limited stack space during server side
       includes, and recognising special filenames such as proxy:http://
       correctly
     * A shutdown hang could occur on Solaris when using lots of piped
       TransferLogs and at least one piped ErrorLog
     * On EBCDIC platforms a bug in the proxy module stopped SSL proxying
       working
     * On Win32, mod_unique_id did not guarantee a unique ID due to
       threading
     * The Win32 Makefiles are now 100% compatible with the Microsoft
       Visual C++ compiler versions 5,6,7

6 files changed, 198 insertions, 63 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 42d399be358..79d75f69a1f 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2001/10/16 04:47:06 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2001/10/17 07:47:52 martti Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -7,8 +7,8 @@
 # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
 #
 
-DISTNAME=		apache_1.3.20
-PKGNAME=		apache6-1.3.20nb1
+DISTNAME=		apache_1.3.22
+PKGNAME=		apache6-1.3.22
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
 			http://www.apache.de/dist/httpd/ \
@@ -18,8 +18,7 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 
 MASTER_SITES+=		ftp://ftp.piuha.net/pub/misc/
 DISTFILES+=		${IPV6_PATCH}
-IPV6_PATCH=		apache-1.3.20-v6-20011009.diff.gz
-PATCH_DIST_STRIP=	-p1	# IPv6 patch needs -p1
+IPV6_PATCH=		apache-1.3.22-v6-20011017.diff.gz
 
 MAINTAINER=		itojun@netbsd.org
 HOMEPAGE=		http://httpd.apache.org/
diff --git a/www/apache6/distinfo b/www/apache6/distinfo
index 309496da7f8..e12df69dee7 100644
--- a/www/apache6/distinfo
+++ b/www/apache6/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.6 2001/10/16 04:11:06 jlam Exp $
+$NetBSD: distinfo,v 1.7 2001/10/17 07:47:53 martti 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 (apache-1.3.20-v6-20011009.diff.gz) = 73210e092fcf5ba2d5f2d555729331d1bc712158
-Size (apache-1.3.20-v6-20011009.diff.gz) = 54361 bytes
-SHA1 (patch-aa) = 0048d2cc0c96626f84e44192aca29256e9f30f72
+SHA1 (apache-1.3.22-v6-20011017.diff.gz) = 11142085dc72175fe6230af33bf68008b47c2ecd
+Size (apache-1.3.22-v6-20011017.diff.gz) = 53584 bytes
+SHA1 (patch-aa) = dbdaff40212075ee386d09674cde45bb96dfb4a5
 SHA1 (patch-ab) = 7619dbf1cf584f9e92998fe25de0860bfbeb277e
 SHA1 (patch-ac) = d4dd4f5521a7c713a038dec2606dad14356d746f
 SHA1 (patch-ae) = 2e4e7aab1cff7ddc82697946eeb8d13cd3aa1df0
 SHA1 (patch-af) = 8115ea5b59fc86e7354effd25dc22525e7627802
 SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3
 SHA1 (patch-ai) = 51d71dfd6706eda420293f2a9f81d8982f789753
-SHA1 (patch-aj) = 9070bd6b504701432302ef89a84b9270e646f833
+SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100
 SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955
diff --git a/www/apache6/files/config.layout b/www/apache6/files/config.layout
index eb4fb4f8082..f86938090c0 100644
--- a/www/apache6/files/config.layout
+++ b/www/apache6/files/config.layout
@@ -1,4 +1,4 @@
-# $NetBSD: config.layout,v 1.1 2001/04/29 21:21:14 jlam Exp $
+# $NetBSD: config.layout,v 1.2 2001/10/17 07:47:53 martti 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/apache6/patches/patch-aa b/www/apache6/patches/patch-aa
index dd32c4a98ac..3cb8871fe29 100644
--- a/www/apache6/patches/patch-aa
+++ b/www/apache6/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2001/02/06 10:58:18 itojun Exp $
+$NetBSD: patch-aa,v 1.5 2001/10/17 07:47:53 martti Exp $
 
---- Makefile.tmpl.orig	Tue Jan 16 01:26:17 2001
-+++ Makefile.tmpl	Tue Feb  6 19:41:48 2001
-@@ -326,20 +326,7 @@
+--- Makefile.tmpl.orig	Sat Oct  6 22:01:09 2001
++++ Makefile.tmpl	Tue Oct 16 22:34:00 2001
+@@ -328,20 +328,7 @@
  			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
  			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
  			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
@@ -23,13 +23,13 @@ $NetBSD: patch-aa,v 1.4 2001/02/06 10:58:18 itojun Exp $
  	fi
  	@echo "<=== [programs]"
  
-@@ -464,15 +451,16 @@
- 		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
- 		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+@@ -473,15 +460,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} |\
@@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.4 2001/02/06 10:58:18 itojun Exp $
  		done; \
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
-@@ -486,7 +474,7 @@
+@@ -495,7 +483,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
diff --git a/www/apache6/patches/patch-aj b/www/apache6/patches/patch-aj
index 39351144dbf..00beb943acb 100644
--- a/www/apache6/patches/patch-aj
+++ b/www/apache6/patches/patch-aj
@@ -1,36 +1,37 @@
-$NetBSD: patch-aj,v 1.5 2001/10/16 04:11:06 jlam Exp $
+$NetBSD: patch-aj,v 1.6 2001/10/17 07:47:54 martti 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/apache6/pkg/PLIST b/www/apache6/pkg/PLIST
index 6079e600005..8c83866dd6a 100644
--- a/www/apache6/pkg/PLIST
+++ b/www/apache6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2001/10/08 13:23:38 martti Exp $
+@comment $NetBSD: PLIST,v 1.14 2001/10/17 07:47:54 martti Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -70,7 +70,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
@@ -87,6 +86,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
@@ -101,20 +101,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
@@ -148,10 +158,13 @@ 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/logs.html
 share/httpd/htdocs/manual/location.html
 share/httpd/htdocs/manual/man-template.html
 share/httpd/htdocs/manual/misc/API.html
@@ -178,17 +191,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
@@ -278,7 +301,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
@@ -300,122 +323,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