Update apache to 1.3.17. Important changes from version 1.3.14 include:

-) Remove patch to avoid dlclose()ing on NetBSD.  The mod_perl vs. perl CGI
   mis-interaction seems to be gone and I wasn't able to reproduce it on my
   system.

*) Fix the declaration of the module structure in mod_example.
*) Fix the handling of variable expansion look-ahead in mod_rewrite,
   i.e. syntax like %{LA-U:REMOTE_USER}, and also fix the parsing of
   more complicated nested RewriteMap lookups.
*) mod_status now respects ?refresh=n of 1 or greater.  If the given
   refresh value is not a number, ?refresh is set to 1 second.
*) Accomodate an out-of-space condition in the piped logs and the
   rotatelogs.c code, and no longer churn log processes for this condition.
*) Make cgi-bin work as a regular directory when using mod_vhost_alias
   with no VirtualScriptAlias directives.
*) Move the check of the Expect request header field after the hook
   for ap_post_read_request, since that is the only opportunity for
   modules to handle Expect extensions.
*) Eliminate caching problems of mod_autoindex results, so the last
   modified date of the directory is returned as the Last-Modified
   and ETag HTTP header tags are sent if IndexOptions TrackModified
   directive/option is used.
*) Correct an issue with Alias and ScriptAlias directives that
   file path arguments were not normalized in canonical form.
   This correction makes no attempt to normalize regular expression
   forms of Alias or ScriptAlias.
*) Add a new LogFormat directive, %c, that will log connection
   status at the end of the response.
*) Update the mime.types file to the registered media types as of 2000-10-19.
*) Restore functionality broken by the mod_rewrite security fix:
   rewrite map lookup keys and default values are now expanded
   so that the lookup can depend on the requested URI etc.

6 files changed, 45 insertions, 65 deletions

diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index d3dd97ff72e..b713d3afe69 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2001/01/14 05:58:01 jlam Exp $
+$NetBSD: patch-aa,v 1.14 2001/02/02 16:39:57 jlam Exp $
 
---- Makefile.tmpl.orig	Sun Jan 14 00:43:01 2001
-+++ Makefile.tmpl	Sun Jan 14 00:48:35 2001
-@@ -382,34 +382,6 @@
+--- Makefile.tmpl.orig	Fri Feb  2 00:42:14 2001
++++ Makefile.tmpl
+@@ -385,34 +385,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,7 +37,7 @@ $NetBSD: patch-aa,v 1.13 2001/01/14 05:58:01 jlam Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -535,15 +507,16 @@
+@@ -538,15 +510,16 @@
  		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
  		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
  	fi
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.13 2001/01/14 05:58:01 jlam Exp $
  		done; \
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
-@@ -557,7 +530,7 @@
+@@ -560,7 +533,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac
index f5fb2124ff4..93f959dc3b7 100644
--- a/www/apache/patches/patch-ac
+++ b/www/apache/patches/patch-ac
@@ -1,30 +1,27 @@
-$NetBSD: patch-ac,v 1.4 2000/10/13 21:46:46 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2001/02/02 16:39:57 jlam Exp $
 
---- htdocs/index.html.en.orig	Sat Nov 20 16:29:40 1999
+--- htdocs/index.html.en.orig	Fri Jan 19 14:39:47 2001
 +++ htdocs/index.html.en
-@@ -28,11 +28,29 @@
+@@ -33,12 +33,26 @@
+ <HR WIDTH="50%" SIZE="8">
  
+ <p>The Apache <A HREF="manual/">documentation</A> has been included with
+-this distribution.</p>
++this distribution.  If the <STRONG>mod_ssl</STRONG> SSL extension has
++been installed, then please carefully read the
++<A HREF="manual/mod/mod_ssl/index.html">SSL documentation</A>.</p>
  
- <P>
--The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.
-+The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.<BR>
-+If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the
-+<A HREF="manual/mod/mod_ssl/index.html">SSL documentation</A> carefully.
-+</P>
-+<P>
-+Information on the NetBSD multiplatform operating system can be found at
-+<A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
-+</P>
- 
- <P>
--You are free to use the image below on an Apache-powered web server.  Thanks for using Apache!
-+The Webmaster of this site is free to use the images below on an
-+Apache/NetBSD-powered Web server.  Thanks for using
-+<A HREF="http://www.apache.org/">Apache</A> on
-+<A HREF="http://www.netbsd.org/">NetBSD</A>!
-+</P>
+-<p>You are free to use the image below on an Apache-powered web server. 
+-Thanks for using Apache!</p>
++<p>Information on the NetBSD multi-platform operating system can be found at
++<A HREF="http://www.netbsd.org/">The NetBSD Project homepage</A></p>
  
 -<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
++<p>Please feel free to use the images below on an Apache/NetBSD-powered web
++server.  Thanks for using
++<A HREF="http://www.apache.org/"Apache</A> on
++<A HREF="http://www.netbsd.org/"NetBSD</A>!</p>
++
 +<DIV ALIGN="CENTER">
 + <A HREF="http://www.apache.org/">
 +  <IMG SRC="apache_pb.gif" BORDER=0 ALT="Powered by Apache">
@@ -33,5 +30,6 @@ $NetBSD: patch-ac,v 1.4 2000/10/13 21:46:46 jlam Exp $
 +  <IMG SRC="sitedrivenby.gif" BORDER=0 ALT="Site driven by NetBSD">
 + </A>
 +</DIV>
+ 
  </BODY>
  </HTML>
diff --git a/www/apache/patches/patch-ae b/www/apache/patches/patch-ae
index 2d934d81f95..defd7cbcd99 100644
--- a/www/apache/patches/patch-ae
+++ b/www/apache/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2001/02/02 16:39:57 jlam Exp $
 
---- src/modules/standard/mod_include.c.orig	Fri Sep 22 14:26:32 2000
+--- src/modules/standard/mod_include.c.orig	Mon Jan 15 12:05:42 2001
 +++ src/modules/standard/mod_include.c
-@@ -92,7 +92,11 @@
+@@ -93,7 +93,11 @@
  #include "http_log.h"
  #include "http_main.h"
  #include "util_script.h"
@@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
  
  #define STARTING_SEQUENCE "<!--#"
  #define ENDING_SEQUENCE "-->"
-@@ -351,7 +355,8 @@
+@@ -352,7 +356,8 @@
   * the tag value is html decoded if dodecode is non-zero
   */
  
@@ -24,7 +24,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
  {
      char *t = tag, *tag_val, c, term;
  
-@@ -470,7 +475,8 @@
+@@ -471,7 +476,8 @@
  /*
   * Do variable substitution on strings
   */
@@ -34,7 +34,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
  			size_t length, int leave_name)
  {
      char ch;
-@@ -668,7 +674,8 @@
+@@ -669,7 +675,8 @@
              parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
              if (tag[0] == 'f') {
                  /* be safe; only files in this directory or below allowed */
@@ -44,7 +44,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
                      error_fmt = "unable to include file \"%s\" "
                          "in parsed file %s";
                  }
-@@ -1080,7 +1087,8 @@
+@@ -1081,7 +1088,8 @@
                          "in parsed file %s";
          }
          else {
@@ -54,7 +54,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
              rr = ap_sub_req_lookup_file(tag_val, r);
  
              if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
-@@ -2159,6 +2167,16 @@
+@@ -2160,6 +2168,16 @@
      }
  }
  
@@ -71,7 +71,7 @@ $NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
  
  
  /* -------------------------- The main function --------------------------- */
-@@ -2283,6 +2301,13 @@
+@@ -2284,6 +2302,13 @@
              }
  #endif
              else {
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af
index a9ac584adb2..7668e264fbf 100644
--- a/www/apache/patches/patch-af
+++ b/www/apache/patches/patch-af
@@ -1,15 +1,15 @@
-$NetBSD: patch-af,v 1.6 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: patch-af,v 1.7 2001/02/02 16:39:57 jlam Exp $
 
---- src/modules/standard/mod_so.c.orig	Thu Sep  7 01:28:46 2000
+--- src/modules/standard/mod_so.c.orig	Fri Feb  2 00:42:13 2001
 +++ src/modules/standard/mod_so.c
-@@ -307,7 +307,15 @@
-     ap_os_dso_handle_t handle;
-     char *file;
- 
+@@ -318,7 +318,15 @@
+         return err;
+     }
+     
 -    file = ap_server_root_relative(cmd->pool, filename);
 +    /*
-+     * XXX Hack: If the filename starts with '!', then just as dlopen()
-+     * XXX without translating to a pathname relative to ServerRoot.
++     * If the filename starts with '!', then just dlopen() it without
++     * translating it to a pathname relative to ServerRoot.
 +     */
 +    if (filename[0] == '!') {
 +	file = filename + 1;
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
deleted file mode 100644
index aae9bc10a41..00000000000
--- a/www/apache/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2000/09/12 14:17:32 jlam Exp $
-
---- src/os/unix/os.c.orig	Sat Jan 15 11:01:09 2000
-+++ src/os/unix/os.c
-@@ -129,7 +129,12 @@
- #elif defined(HAVE_DYLD)
-     NSUnLinkModule(handle,FALSE);
- 
--#else
-+/*
-+ * Work around Apache dlclose() bug, where shared objects may be
-+ * dlclose()d before their cleanup procedures are called.
-+ * Fixes mod_perl vs. CGI interaction bug.
-+ */
-+#elif 0
-     dlclose(handle);
- #endif
- 
diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai
index eb7417cb769..1789c5a0751 100644
--- a/www/apache/patches/patch-ai
+++ b/www/apache/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2000/09/12 14:17:33 jlam Exp $
+$NetBSD: patch-ai,v 1.4 2001/02/02 16:39:58 jlam Exp $
 
---- src/support/apxs.pl.orig	Thu Sep  7 01:19:50 2000
+--- src/support/apxs.pl.orig	Fri Feb  2 00:42:14 2001
 +++ src/support/apxs.pl
-@@ -424,8 +424,7 @@
+@@ -427,8 +427,7 @@
          my $t = $f;
          $t =~ s|^.+/([^/]+)$|$1|;
          if ($opt_i) {