Update to 2.0.4:

2.0.4 April 16, 2008

Fix $r->location corruption under certain conditions
[Gozer]

Fix a crash when spawning Perl threads under Perl 5.10
[Gozer]

Fix erratic behaviour when filters were used with Perl 5.10
[Gozer]

Fix problems with redefinitions of perl_free as free and perl_malloc
as malloc on Win32, as described at
 http://marc.info/?l=apache-modperl&m=119896407510526&w=2
[Tom Donovan]

Fix a crash when running a sub-request from within a filter where
mod_perl was not the content handler. [Gozer]

Refactor tests to use keepalives instead of same_interp [Gozer, Phred]

Apache2::Reload has been moved to an externally maintained
CPAN distribution [Fred Moyer <fred@redhotpenguin.com>]

PerlCleanupHandler are now registered with a subpool of $r->pool,
instead of $r->pool itself, ensuring they run _before_ any other
$r->pool cleanups [Torsten Foertsch]

Fix a bug that would prevent pnotes from being cleaned up properly
at the end of the request [Torsten Foertsch]

On Win32, embed the manifest file, if present, in mod_perl.so,
so as to work with VC 8 [Steve Hay, Randy Kobes]

Expose apr_thread_rwlock_t with the APR::ThreadRWLock module
[Torsten Foertsch]

Don't waste an extra interpreter anymore under threaded MPMs when using a
modperl handler [Torsten Foertsch]

Fix a bug that could cause a crash when using $r->push_handlers() multiple
times for a phase that has no configured handlers [Torsten Foertsch]

Catch up with some httpd API changes
  2.2.4:
   The full server version information is now included in the error log at
startup as well as server status reports, irrespective of the setting
of the ServerTokens directive. ap_get_server_version() is now
deprecated, and is replaced by ap_get_server_banner() and
ap_get_server_description(). [Jeff Trawick]

  2.3.0:
ap_get_server_version() has been removed. Third-party modules must
now use ap_get_server_banner() or ap_get_server_description().
[Gozer]

fixed Apache2::compat Apache2::ServerUtil::server_root() resolution
issues [Joshua Hoblitt]

*) SECURITY: CVE-2007-1349 (cve.mitre.org)
fix unescaped variable interprolation in regular expression
[Randal L. Schwartz <merlyn@stonehenge.com>, Fred Moyer <fred@redhotpenguin.com>]

Make $r->the_request() writeable
[Fred Moyer <fred@redhotpenguin.com>]

fix ModPerl::RegistryCooker::read_script to handle all possible
errors, previously there was a case where Apache2::Const::OK was
returned on an error.  [Eivind Eklund <eeklund@gmail.com>]

a minor compilation warning resolved in modperl_handler_new_from_sv
[Stas]

a minor compilation warning resolved in modperl_gtop_size_string
[Stas]

Prevent direct use of _deprecated_ Apache2::ReadConfig in
<Perl> sections with httpd Alias directives from
incorrectly generating
'The Alias directive in xxxxx at line y will probably never match'
messages.
[Philip M. Gollucci <pgollucci@p6m78g.com>]

Prevent Apache2::PerSections::symdump() from returning invalid
httpd.conf snippets like 'Alias undef'
[Philip M. Gollucci <pgollucci@p6m78g.com>]

Require B-Size 0.9 for Apache2::Status which fixes
Can't call method "script_name" on an undefined value
[Philip M. Gollucci <pgollucci@p6m78g.com>]

-march=pentium4 or anything with an = in it in CCFLAGS or @ARGV
that gets passed to xs/APR/APR/Makefile.PL broke the @ARGV
parsing.  I.E. FreeBSD port builds when users had CPUTYPE
set in /etc/make.conf.
[Philip M. Gollucci <pgollucci@p6m7g8.com>]

Fixes to get bleed-ithread (5.9.5+) to comile again.
[Philip M. Gollucci <pgollucci@p6m7g8.com>]

3 files changed, 8 insertions, 7 deletions

diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index 4d52bda72fd..b8e6c509f9e 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2007/06/30 16:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2008/04/23 20:36:41 wiz Exp $
 
-DISTNAME=	mod_perl-2.0.3
+DISTNAME=	mod_perl-2.0.4
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
 CATEGORIES=	www perl5
 MASTER_SITES=	http://perl.apache.org/dist/
diff --git a/www/ap2-perl/PLIST b/www/ap2-perl/PLIST
index a5e88474498..22ad250ade2 100644
--- a/www/ap2-perl/PLIST
+++ b/www/ap2-perl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/12/07 02:57:05 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/04/23 20:36:41 wiz Exp $
 bin/mp2bug
 include/httpd/mod_perl.h
 include/httpd/modperl_apache_compat.h
@@ -73,6 +73,7 @@ share/doc/mod_perl/api/APR/Status.pod
 share/doc/mod_perl/api/APR/String.pod
 share/doc/mod_perl/api/APR/Table.pod
 share/doc/mod_perl/api/APR/ThreadMutex.pod
+share/doc/mod_perl/api/APR/ThreadRWLock.pod
 share/doc/mod_perl/api/APR/URI.pod
 share/doc/mod_perl/api/APR/UUID.pod
 share/doc/mod_perl/api/APR/Util.pod
diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo
index ca68195a9ce..987c2fa6bab 100644
--- a/www/ap2-perl/distinfo
+++ b/www/ap2-perl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2006/12/07 02:57:05 xtraeme Exp $
+$NetBSD: distinfo,v 1.10 2008/04/23 20:36:41 wiz Exp $
 
-SHA1 (mod_perl-2.0.3.tar.gz) = e5d8b3cd7273c284cfbd79acb953ce179322bdc9
-RMD160 (mod_perl-2.0.3.tar.gz) = 29662a131c1bef6e4adc551d4467d12931a4d919
-Size (mod_perl-2.0.3.tar.gz) = 3714974 bytes
+SHA1 (mod_perl-2.0.4.tar.gz) = 65299a16ec414a690a48a2bbe63acaa3c6bb897b
+RMD160 (mod_perl-2.0.4.tar.gz) = 111b8f33e2dcc43ef7a0a7d557ceb467f0c55c6d
+Size (mod_perl-2.0.4.tar.gz) = 3727717 bytes