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.

3 files changed, 45 insertions, 37 deletions

diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh
index 57ff96a0a58..80f9eee3270 100644
--- a/www/apache/files/apache.sh
+++ b/www/apache/files/apache.sh
@@ -1,47 +1,56 @@
 #! /bin/sh
 #
-# $NetBSD: apache.sh,v 1.8 2000/10/13 21:46:32 jlam Exp $
+# $NetBSD: apache.sh,v 1.9 2001/02/02 16:39:57 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
 
 name="apache"
-command="@PREFIX@/sbin/apachectl"
+ctl_command="@PREFIX@/sbin/apachectl"
+command="@PREFIX@/sbin/httpd"
 pidfile="/var/run/httpd.pid"
 conffile="@PREFIX@/etc/httpd/httpd.conf"
 
 apache_start="start"
 
-if [ -f @PREFIX@/etc/httpd/mod_ssl.conf ]
+if [ -f @PREFIX@/etc/httpd/apache_start.conf ]
 then
 	# This file can reset apache_start to "startssl"
-	. @PREFIX@/etc/httpd/mod_ssl.conf
+	. @PREFIX@/etc/httpd/apache_start.conf
 fi
 
 cmd=${1:-start}
 
-case ${cmd} in
-start)
-	if [ -x ${command} -a -f ${conffile} ]; then
+if [ -x ${ctl_command} -a -x ${command} ]
+then
+	case ${cmd} in
+	start)
 		echo "Starting ${name}."
-		${command} ${apache_start} > /dev/null
-	fi
-	;;
-stop)
-	if [ -x ${command} -a -f ${pidfile} ]; then
-		echo "Stopping ${name}."
-		${command} stop > /dev/null
-	fi
-	;;
-restart)
-	( $0 stop )
-	sleep 5
-	$0 start
-	;;
-*)
-	if [ -x ${command} ]; then
-		${command} ${cmd}
-	fi
-	;;
-esac
+		${ctl_command} ${apache_start} > /dev/null
+		;;
+
+	stop)
+		if [ -a -f ${pidfile} ]
+		then
+			echo "Stopping ${name}."
+			${ctl_command} ${cmd} > /dev/null
+		fi
+		;;
+
+	restart)
+		( $0 stop )
+		sleep 5
+		$0 start
+		;;
+
+	status)
+		${ctl_command} ${cmd}
+		;;
+
+	*)
+		echo 1>&2 "Usage: $0 [restart|start|stop|status]"
+		exit 1
+		;;
+	esac
+fi
 exit 0
diff --git a/www/apache/files/md5 b/www/apache/files/md5
index ccb2e58abe1..345f4542f8c 100644
--- a/www/apache/files/md5
+++ b/www/apache/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.17 2000/10/17 18:14:16 jlam Exp $
+$NetBSD: md5,v 1.18 2001/02/02 16:39:57 jlam Exp $
 
-MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
-MD5 (mod_ssl-2.7.1-1.3.14.tar.gz) = 99e05bd4ab7bd5c72fbb70bd8cfbf283
+MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
+MD5 (mod_ssl-2.8.0-1.3.17.tar.gz) = 3a158f3b5442cb8b7bee4a55851c3794
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/apache/files/patch-sum b/www/apache/files/patch-sum
index ee4f8b6bd8a..e297aa417be 100644
--- a/www/apache/files/patch-sum
+++ b/www/apache/files/patch-sum
@@ -1,11 +1,10 @@
-$NetBSD: patch-sum,v 1.11 2001/01/14 05:58:01 jlam Exp $
+$NetBSD: patch-sum,v 1.12 2001/02/02 16:39:57 jlam Exp $
 
-MD5 (patch-aa) = 5f9d7e7c99dc689a32a3c3a151760144
+MD5 (patch-aa) = 1f5ddd83cedeaff72df8c6428a8878ba
 MD5 (patch-ab) = 86886e1e816bcc5527072c4027586cd3
-MD5 (patch-ac) = 7b43e8d3467d6a13480991fcaba44350
+MD5 (patch-ac) = ebee02f9d9f26ab4c200b252ded95d73
 MD5 (patch-ad) = 40f2b9c12d7ef36bbc842480af61b833
-MD5 (patch-ae) = b76129eb2aa925e8531cbc73593191c1
-MD5 (patch-af) = 40600e577259ca9afc36f1ff2aa1a9f9
-MD5 (patch-ag) = 6c7b5fd3185385e0b5309cb707516d18
+MD5 (patch-ae) = c260133920eebada06030552c3306c3d
+MD5 (patch-af) = 197a9b91da502834ec5d4cab2c99b2c1
 MD5 (patch-ah) = e27e529142e5ee6fc1be0f965e5510e0
-MD5 (patch-ai) = 650417c389d59a1e5b9aa4fcf611093d
+MD5 (patch-ai) = 57b95d04f0ed35252b8ead041017feac