upgrade to 2.0.48

Changes with Apache 2.0.48

  *) SECURITY [CAN-2003-0789]: mod_cgid: Resolve some mishandling of
     the AF_UNIX socket used to communicate with the cgid daemon and
     the CGI script.  [Jeff Trawick]
  *) SECURITY [CAN-2003-0542]: Fix buffer overflows in mod_alias and
     mod_rewrite which occurred if one configured a regular expression
     with more than 9 captures.  [André Malo]
  *) mod_include: fix segfault which occured if the filename was not
     set, for example, when processing some error conditions.
     PR 23836.  [Brian Akins <bakins@web.turner.com>, André Malo]
  *) fix the config parser to support <Foo>..</Foo> containers (no
     arguments in the opening tag) supported by httpd 1.3. Without
     this change mod_perl 2.0's <Perl> sections are broken.
     ["Philippe M. Chiasson" <gozer@cpan.org>]
  *) mod_cgid: fix a hash table corruption problem which could
     result in the wrong script being cleaned up at the end of a
     request.  [Jeff Trawick]
  *) Update httpd-*.conf to be clearer in describing the connection
     between AddType and AddEncoding for defining the meaning of
     compressed file extensions. [Roy Fielding]
  *) mod_rewrite: Don't die silently when failing to open RewriteLogs.
     PR 23416.  [André Malo]
  *) mod_rewrite: Fix mod_rewrite's support of the [P] option to send
     rewritten request using "proxy:". The code was adding multiple "proxy:"
     fields in the rewritten URI. PR: 13946.
     [Eider Oliveira <eider@bol.com.br>]
  *) cache_util: Fix ap_check_cache_freshness to check max_age, smax_age, and
     expires as directed in RFC 2616. [Thomas Castelle tcastelle@generali.fr]
  *) Ensure that ssl-std.conf is generated at configure time, and switch
     to using the expanded config variables to work the same as
     httpd-std.conf PR: 19611
     [Thom May]
  *) mod_ssl: Fix segfaults after renegotiation failure. PR 21370
     [Hartmut Keil <Hartmut.Keil@adnovum.ch>]
  *) mod_autoindex: If a directory contains a file listed in the
     DirectoryIndex directive, the folder icon is no longer replaced
     by the icon of that file. PR 9587.
     [David Shane Holden <dpejesh@yahoo.com>]
  *) Fixed mod_usertrack to not get false positive matches on the
     user-tracking cookie's name.  PR 16661.
     [Manni Wood <manniwood@planet-save.com>]
  *) mod_cache: Fix the cache code so that responses can be cached
     if they have an Expires header but no Etag or Last-Modified
     headers. PR 23130.
     [bjorn@exoweb.net]
  *) mod_log_config: Fix %b log format to write really "-" when 0 bytes
     were sent (e.g. with 304 or 204 response codes).  [Astrid Keßler]
  *) Modify ap_get_client_block() to note if it has seen EOS.
     [Justin Erenkrantz]
  *) Fix a bug, where mod_deflate sometimes unconditionally compressed the
     content if the Accept-Encoding header contained only other tokens than
     "gzip" (such as "deflate"). PR 21523.  [Joe Orton, André Malo]
  *) Avoid an infinite recursion, which occured if the name of an included
     config file or directory contained a wildcard character. PR 22194.
     [André Malo]
  *) mod_ssl: Fix a problem setting variables that represent the
     client certificate chain.  PR 21371  [Jeff Trawick]
  *) Unix: Handle permissions settings for flock-based mutexes in
     unixd_set_global|proc_mutex_perms().  Allow the functions to be
     called for any type of mutex.  PR 20312  [Jeff Trawick]
  *) ab: Work over non-loopback on Unix again. PR 21495. [Jeff Trawick]
  *) Fix a misleading message from the some of the threaded MPMs when
     MaxClients has to be lowered due to the setting of ServerLimit.
     [Jeff Trawick]
  *) Lower the severity of the "listener thread didn't exit" message
     to debug, as it is of interest only to developers.  PR 9011
     [Jeff Trawick]
  *) MPMs: The bucket brigades subsystem now honors the MaxMemFree setting.
     [Cliff Woolley, Jean-Jacques Clar]
  *) Install config.nice into the build/ directory to make
     minor version upgrades easier. [Joshua Slive]
  *) Fix mod_deflate so that it does not call deflate() without checking
     first whether it has something to deflate. (Currently this causes
     deflate to generate a fatal error according to the zlib spec.)
     PR 22259. [Stas Bekman]
  *) mod_ssl: Fix FakeBasicAuth for subrequest.  Log an error when an
     identity spoof is encountered.
     [Sander Striker]
  *) mod_rewrite: Ignore RewriteRules in .htaccess files if the directory
     containing the .htaccess file is requested without a trailing slash.
     PR 20195.  [André Malo]
  *) ab: Overlong credentials given via command line no longer clobber
     the buffer.  [André Malo]
  *) mod_deflate: Don't attempt to hold all of the response until we're
     done.  [Justin Erenkrantz]
  *) Assure that we block properly when reading input bodies with SSL.
     PR 19242.  [David Deaves <David.Deaves@dd.id.au>, William Rowe]
  *) Update mime.types to include latest IANA and W3C types.  [Roy Fielding]
  *) mod_ext_filter: Set additional environment variables for use by
     the external filter.  PR 20944.  [Andrew Ho, Jeff Trawick]
  *) Fix buildconf errors when libtool version changes.  [Jeff Trawick]
  *) Remember an authenticated user during internal redirects if the
     redirection target is not access protected and pass it
     to scripts using the REDIRECT_REMOTE_USER environment variable.
     PR 10678, 11602.  [André Malo]
  *) mod_include: Fix a trio of bugs that would cause various unusual
     sequences of parsed bytes to omit portions of the output stream.
     PR 21095. [Ron Park <ronald.park@cnet.com>, André Malo, Cliff Woolley]
  *) Update the header token parsing code to allow LWS between the
     token word and the ':' seperator.  [PR 16520]
     [Kris Verbeeck <kris.verbeeck@advalvas.be>, Nicel KM <mnicel@yahoo.com>]
  *) Eliminate creation of a temporary table in ap_get_mime_headers_core()
     [Joe Schaefer <joe+gmane@sunstarsys.com>]
  *) Added FreeBSD directory layout. PR 21100.
     [Sander Holthaus <info@orangexl.com>, André Malo]
  *) Fix NULL-pointer issue in ab when parsing an incomplete or non-HTTP
     response. PR 21085. [Glenn Nielsen <glenn@apache.org>, André Malo]
  *) mod_rewrite: Perform child initialization on the rewrite log lock.
     This fixes a log corruption issue when flock-based serialization
     is used (e.g., FreeBSD).  [Jeff Trawick]
  *) Don't respect the Server header field as set by modules and CGIs.
     As with 1.3, for proxy requests any such field is from the origin
     server; otherwise it will have our server info as controlled by
     the ServerTokens directive.  [Jeff Trawick]

5 files changed, 32 insertions, 18 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 3b3504e1997..0a34deaeac7 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2003/10/11 13:40:20 grant Exp $
+# $NetBSD: Makefile,v 1.28 2003/10/28 04:49:32 itojun Exp $
 
 PKGNAME=		apache-${APACHE_VERSION}
-PKGREVISION=		1
 CATEGORIES=		www
 
 HOMEPAGE=		http://httpd.apache.org/
diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common
index 694a9e2035d..8753f74ae8f 100644
--- a/www/apache2/Makefile.common
+++ b/www/apache2/Makefile.common
@@ -1,5 +1,5 @@
 DISTNAME=		httpd-${APACHE_VERSION}
-APACHE_VERSION=		2.0.47
+APACHE_VERSION=		2.0.48
 APR_VERSION=            0.9.4
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/} \
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index c35e063f605..baea041d7c4 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2003/07/09 08:09:05 itojun Exp $
+@comment $NetBSD: PLIST,v 1.17 2003/10/28 04:49:32 itojun Exp $
 etc/rc.d/apache
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
@@ -78,6 +78,7 @@ share/examples/httpd/httpd-std.conf
 share/examples/httpd/magic
 share/examples/httpd/mime.types
 share/examples/httpd/ssl-std.conf
+share/httpd/build/config.nice
 share/httpd/build/config_vars.mk
 share/httpd/build/instdso.sh
 share/httpd/build/library.mk
@@ -489,10 +490,12 @@ share/httpd/manual/filter.html
 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.html.ru.koi8-r
 share/httpd/manual/filter.xml
 share/httpd/manual/filter.xml.ja
 share/httpd/manual/filter.xml.ko
 share/httpd/manual/filter.xml.meta
+share/httpd/manual/filter.xml.ru
 share/httpd/manual/glossary.html
 share/httpd/manual/glossary.html.en
 share/httpd/manual/glossary.html.ko.euc-kr
@@ -503,10 +506,12 @@ share/httpd/manual/handler.html
 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.html.ru.koi8-r
 share/httpd/manual/handler.xml
 share/httpd/manual/handler.xml.ja
 share/httpd/manual/handler.xml.ko
 share/httpd/manual/handler.xml.meta
+share/httpd/manual/handler.xml.ru
 share/httpd/manual/howto/auth.html
 share/httpd/manual/howto/auth.html.en
 share/httpd/manual/howto/auth.html.ja.jis
@@ -553,14 +558,15 @@ share/httpd/manual/images/up.gif
 share/httpd/manual/index.html
 share/httpd/manual/index.html.de
 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.html.ru.koi8-r
 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/index.xml.ru
 share/httpd/manual/install.html
 share/httpd/manual/install.html.de
 share/httpd/manual/install.html.en
@@ -621,6 +627,10 @@ share/httpd/manual/misc/perf-tuning.html
 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/relevant_standards.html
+share/httpd/manual/misc/relevant_standards.html.en
+share/httpd/manual/misc/relevant_standards.xml
+share/httpd/manual/misc/relevant_standards.xml.meta
 share/httpd/manual/misc/rewriteguide.html
 share/httpd/manual/misc/rewriteguide.html.en
 share/httpd/manual/misc/rewriteguide.xml
@@ -1119,8 +1129,10 @@ share/httpd/manual/programs/httpd.xml
 share/httpd/manual/programs/httpd.xml.meta
 share/httpd/manual/programs/index.html
 share/httpd/manual/programs/index.html.en
+share/httpd/manual/programs/index.html.ru.koi8-r
 share/httpd/manual/programs/index.xml
 share/httpd/manual/programs/index.xml.meta
+share/httpd/manual/programs/index.xml.ru
 share/httpd/manual/programs/logresolve.html
 share/httpd/manual/programs/logresolve.html.en
 share/httpd/manual/programs/logresolve.xml
@@ -1334,11 +1346,13 @@ 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.html.ru.koi8-r
 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/index.xml.ru
 share/httpd/manual/vhosts/ip-based.html
 share/httpd/manual/vhosts/ip-based.html.en
 share/httpd/manual/vhosts/ip-based.html.ko.euc-kr
@@ -1358,6 +1372,7 @@ 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.de
+share/httpd/manual/vhosts/name-based.xml.ja
 share/httpd/manual/vhosts/name-based.xml.ko
 share/httpd/manual/vhosts/name-based.xml.meta
 @dirrm share/httpd/manual/developer
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index f5184067873..a57883be0a6 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2003/07/09 08:09:06 itojun Exp $
+$NetBSD: distinfo,v 1.23 2003/10/28 04:49:32 itojun Exp $
 
-SHA1 (httpd-2.0.47.tar.gz) = dbbb06472ddc65cbc59028e42d4476b186275632
-Size (httpd-2.0.47.tar.gz) = 6217401 bytes
-SHA1 (patch-aa) = 2b7a2c0db5abac66966eaea2efb8609843e8abf4
+SHA1 (httpd-2.0.48.tar.gz) = 1e7311d0a2ff845a0d0f60ca96981b82403db2d4
+Size (httpd-2.0.48.tar.gz) = 6258490 bytes
+SHA1 (patch-aa) = b04f73fcc090e64c7c7de480fe504bb7a9e305bd
 SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
 SHA1 (patch-ah) = f655dbabb32884a20e77f4791fa762e6c0e6cf74
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index b915194969c..8202e447362 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $
+$NetBSD: patch-aa,v 1.11 2003/10/28 04:49:33 itojun Exp $
 
---- Makefile.in.orig	2003-05-18 02:11:37.000000000 +0900
-+++ Makefile.in	2003-05-29 09:48:23.000000000 +0900
+--- Makefile.in.orig	Mon Aug 25 09:12:06 2003
++++ Makefile.in	Tue Oct 28 13:39:36 2003
 @@ -14,7 +14,7 @@
  PROGRAMS        = $(PROGRAM_NAME)
  TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
@@ -42,10 +42,10 @@ $NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $
  	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);
+ 	cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
+ 	cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
  
- htdocs-srcdir = $(top_srcdir)/docs/docroot
-@@ -107,7 +109,7 @@
+@@ -108,7 +110,7 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $
             echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
          else \
  	    echo Installing HTML documents ; \
-@@ -117,7 +119,7 @@
+@@ -118,7 +120,7 @@
  	fi
  
  install-error:
@@ -63,7 +63,7 @@ $NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $
             echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
          else \
  	    echo Installing error documents ; \
-@@ -127,7 +129,7 @@
+@@ -128,7 +130,7 @@
  	fi
  
  install-icons:
@@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.10 2003/05/29 01:02:29 itojun Exp $
             echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
          else \
  	    echo Installing icons ; \
-@@ -137,7 +139,7 @@
+@@ -138,7 +140,7 @@
  	fi
  
  install-cgi: