Update apache to 1.3.23 with the EAPI patch from mod_ssl-2.8.6-1.3.23.

   The main new features in 1.3.23 (compared to 1.3.22) are:

     * HTTP/1.1 support for mod_proxy.
     * Other mod_proxy improvements.
     * The new 'FileETag' directive to allow one to build the
       format of the ETag via runtime directives.
     * Addition of a 'filter callback' function to enable modules to
       intercept the output byte stream for dynamic page caching.

   The following bugs were found in Apache 1.3.22 and have been fixed in
   Apache 1.3.23:

     * Fix incorrect "Content-Length" header in the 416 response.
     * Revert mod_negotation's handling of path_info and query_args
       to the 1.3.20 behavior (PRs: 8628, 8582, 8538).
     * Prevent an Apache module from being loaded or added twice due
       to duplicate LoadModule or AddModule directives.

3 files changed, 11 insertions, 11 deletions

diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index b4f0e31706c..77a85fc98e9 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.17 2002/01/01 06:12:06 jlam Exp $
+$NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $
 
---- Makefile.tmpl.orig	Tue Jan  1 00:38:59 2002
+--- Makefile.tmpl.orig	Fri Feb  1 10:05:43 2002
 +++ Makefile.tmpl
 @@ -324,11 +324,6 @@
  	$(MKDIR) $(root)$(mandir)/man1
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.17 2002/01/01 06:12:06 jlam Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -531,7 +498,7 @@
+@@ -533,7 +500,7 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.17 2002/01/01 06:12:06 jlam Exp $
  		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
  	else \
  		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-@@ -553,9 +520,10 @@
+@@ -555,9 +522,10 @@
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
@@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.17 2002/01/01 06:12:06 jlam Exp $
  		done; \
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
-@@ -569,7 +537,7 @@
+@@ -571,7 +539,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af
index 0858d63590d..ba7ddfcf3fa 100644
--- a/www/apache/patches/patch-af
+++ b/www/apache/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2001/10/17 19:17:00 jlam Exp $
+$NetBSD: patch-af,v 1.9 2002/02/01 16:04:39 jlam Exp $
 
---- src/modules/standard/mod_so.c.orig	Wed Oct 17 11:47:02 2001
+--- src/modules/standard/mod_so.c.orig	Fri Feb  1 10:05:43 2002
 +++ src/modules/standard/mod_so.c
-@@ -321,7 +321,15 @@
+@@ -324,7 +324,15 @@
          return err;
      }
      
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
index e6a915c575c..b8683610031 100644
--- a/www/apache/patches/patch-ag
+++ b/www/apache/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2001/02/27 20:04:23 jdolecek Exp $
+$NetBSD: patch-ag,v 1.7 2002/02/01 16:04:39 jlam Exp $
 
---- src/os/unix/os.c.orig	Sat Jan 15 11:01:09 2000
+--- src/os/unix/os.c.orig	Mon Nov 12 12:36:38 2001
 +++ src/os/unix/os.c
-@@ -129,7 +129,12 @@
+@@ -132,7 +132,12 @@
  #elif defined(HAVE_DYLD)
      NSUnLinkModule(handle,FALSE);