Update ap-fastcgi and ap2-fastcgi to 2.4.6.

2.4.6

 *) Fix a bug I introduced in 2.4.4 that broke dynamic application
    restarts.  Reported by [Yar <yarodin gmail.com>]

2.4.4

 *) Allow FastCgiServer and FastCgiExternal server directives
    to be used within VirtualHosts (again).  Add docs to explain
    potential accessibility from other VirtualHosts.
    [Rob Saccoccio <robs fastcgi.com>]

 *) Check for a null filename in the request to prevent an NPE that
    was occurring when a WebSphere Apache module was also in use.
    [Fabian Pehla <fabian pehla.de>}

 *) [AP2] Call ap_set_content_type() rather than setting the content_type
    directly so that the AddOutputFilterByType directive can work correctly.
    [Thomas 'Freaky' Hurst <tom.hurst clara.net>]

 *) Don't use initializers for timeval structs because on 64bit
    MVS there is a padding field in between tv_sec and tv_usec.
    [Eric Covener <covener gmail.com>]

 *) [AP2] Add support for nph (non parsed header) scripts.
	[Peter Zijlstra <peterz nedstat.com>]

 *) Abort the request if the client connection ends prematurely.
    [Peter Zijlstra <peterz nedstat.com>]

 *) Introduce the apr_* backward compatibility macros removed
    in Apache 2.2.  ["Daniel Smertnig" <daniel.smertnig gmail.com>]

 *) Fix a problem (remove install-modules) in Makefile.AP2 under
    Apache 2.2.  ["Daniel Smertnig" <daniel.smertnig gmail.com>]

 *) Don't count an application exit towards the number of
    failures when doing restart backoff handling if the exit
    status is 0.  ["Rob Saccoccio" <robs fastcgi.com>]

 *) [*nix] Don't use suexec when there is no user/group in effect.
    This change is consistent with Apache2 handling.  Identified
    by ["Florian Effenberger" <floeff arcor.de>].

 *) Add a -min-server-life option to the FastCgiConfig and
    FastCgiServer directives to provide better control of the
    restart backoff feature.  ["Benjamin Osheroff" <ben gimbo.net>]

4 files changed, 11 insertions, 23 deletions

diff --git a/www/ap-fastcgi/Makefile.common b/www/ap-fastcgi/Makefile.common
index 71d450adf66..553c5a231fd 100644
--- a/www/ap-fastcgi/Makefile.common
+++ b/www/ap-fastcgi/Makefile.common
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.common,v 1.5 2007/12/05 17:42:49 ghen Exp $
+# $NetBSD: Makefile.common,v 1.6 2008/10/01 10:03:11 taca Exp $
 #
-DISTNAME=	mod_fastcgi-2.4.2
+# used by www/ap-fastcgi/Makefile
+# used by www/ap2-fastcgi/Makefile
+#
+DISTNAME=	mod_fastcgi-2.4.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.fastcgi.com/dist/
 
diff --git a/www/ap-fastcgi/distinfo b/www/ap-fastcgi/distinfo
index 1f2e246a1b9..265561d6a43 100644
--- a/www/ap-fastcgi/distinfo
+++ b/www/ap-fastcgi/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.6 2006/12/29 13:35:30 joerg Exp $
+$NetBSD: distinfo,v 1.7 2008/10/01 10:03:11 taca Exp $
 
-SHA1 (mod_fastcgi-2.4.2.tar.gz) = a56be62a3f08262ae187989f5dacb3464a030e2e
-RMD160 (mod_fastcgi-2.4.2.tar.gz) = 83c01567bb9a6d39345573137408615260972e1e
-Size (mod_fastcgi-2.4.2.tar.gz) = 98295 bytes
+SHA1 (mod_fastcgi-2.4.6.tar.gz) = 69c56548bf97040a61903b32679fe3e3b7d3c2d4
+RMD160 (mod_fastcgi-2.4.6.tar.gz) = 95caee4847cb725aab6c7d8bf2db9dee49d46eec
+Size (mod_fastcgi-2.4.6.tar.gz) = 100230 bytes
 SHA1 (patch-aa) = c7ead44e7c0530f093065f034900e1be84746ec2
 SHA1 (patch-ab) = 257d7e2b65fedd630e85acfb77bb9b6ddd21c6bf
 SHA1 (patch-ac) = 2cc983a1f3d63a650fb648e60b3529c677857695
 SHA1 (patch-ad) = c020c369f3075c28d30087e1b72ae6b0a3105373
 SHA1 (patch-ae) = b934b3bc5b40dd62d70a06458849ca1049a3c9ae
-SHA1 (patch-af) = 4b35e483fe867959c29a6dbda05845f00670f91a
diff --git a/www/ap-fastcgi/patches/patch-af b/www/ap-fastcgi/patches/patch-af
deleted file mode 100644
index a0f8e3ceddb..00000000000
--- a/www/ap-fastcgi/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/12/18 12:39:45 abs Exp $
-
---- Makefile.AP2.orig	2002-07-29 02:36:34.000000000 +0100
-+++ Makefile.AP2
-@@ -20,8 +20,6 @@ APACHECTL = apachectl
- 
- all: local-shared-build
- 
--install: install-modules
--
- clean:
- 	-rm -f *.o *.lo *.slo *.la 
- 
diff --git a/www/ap2-fastcgi/Makefile b/www/ap2-fastcgi/Makefile
index 9d5f2fe3104..050fa0c7fa0 100644
--- a/www/ap2-fastcgi/Makefile
+++ b/www/ap2-fastcgi/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2007/12/05 17:42:49 ghen Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/01 10:03:11 taca Exp $
 
 .include "../../www/ap-fastcgi/Makefile.common"
 
 PKGNAME=		${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
-PKGREVISION=		4
 PKG_APACHE_ACCEPTED=	apache2 apache22
 APACHE_MANUAL=		manual
-APACHE_MODULE=		# defined
+APACHE_MODULE=		YES
 USE_LIBTOOL=		YES
 
 MAKE_FLAGS+=		LIBTOOL=${LIBTOOL:Q}