head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.3.0.16 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.14 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.12 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.10 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.8 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.6 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.4 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.2 pkgsrc-2009Q2-base:1.3 pkgsrc-2008Q4:1.2.0.42 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.40 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.38 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.36 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.34 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.32 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.30 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.28 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.26 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.24 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.22 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.20 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.18 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.16 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.14 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.12 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.10 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; locks; strict; comment @# @; 1.4 date 2011.04.04.09.24.14; author adam; state dead; branches; next 1.3; 1.3 date 2009.06.15.17.38.21; author he; state Exp; branches; next 1.2; 1.2 date 2004.01.17.12.36.03; author bad; state dead; branches; next 1.1; 1.1 date 2003.06.03.19.17.20; author epg; state Exp; branches; next ; desc @@ 1.4 log @Changes 2.0.5: * Prepare modperl for the upcoming perl 5.14 * Add lib/ModPerl/MethodLookup.pm to MANIFEST via lib/ModPerl/Manifest.pm * PerlIOApache_write() now throws an APR::Error object, rather than just a string error, if modperl_wbucket_write() fails. * Authentication tests fail with LWP 5.815 and later * Concise test won't perform unless StatusTerse is set to ON * Look for a usable apxs in $ENV{PATH} if all other options fail, then prompt the user for one. * Work around bootstrap warnings when Apache2::BuildConfig has not been created yet. * Remove Apache::test compatibility (part of mod_perl 1.2.7), that code causes build issues and is 4 versions out of date. * Make sure perl is built either with multiplicity and ithreads or without both * Support for "install_vendor" and "install_site" make targets * Run tests on bundled pure perl Apache::* modules * Implement a mini-preprocess language for map-files in xs/maps. * Implement APR::Socket::fileno * Export PROXYREQ_RESPONSE, a missing PROXYREQ_* constant * Make sure standard file descriptors are preserved by the perl-script handler * Fix the filter init handler attribute check in modperl_filter_resolve_init_handler() * Make sure buffer is a valid SV in modperl_filter_read() * Move modperl_response_finish() out of modperl_response_handler_run in mod_perl.c @ text @$NetBSD: patch-aa,v 1.3 2009/06/15 17:38:21 he Exp $ This is revision 760926 from modperl's svn repository: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Status.pm?view=log&pathrev=761081 Fix an XSS bug in Apache2::Status, ref. CVE-2009-0796. --- lib/Apache2/Status.pm.orig 2007/12/31 08:05:11 607697 +++ lib/Apache2/Status.pm 2009/04/01 15:39:56 760926 @@@@ -29,7 +29,7 @@@@ use Apache2::Const -compile => qw(OK); -$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0 +$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0 use constant IS_WIN32 => ($^O eq "MSWin32"); @@@@ -126,7 +126,7 @@@@ $r->print(symdump($r, $qs)); } else { - my $uri = $r->uri; + my $uri = $r->location; $r->print('

'); $r->print( map { qq[$status{$_}
\n] } sort { lc $a cmp lc $b } keys %status @@@@ -198,7 +198,7 @@@@ sub status_inc { my ($r) = @@_; - my $uri = $r->uri; + my $uri = $r->location; my @@retval = ( '', "", @@@@ -289,7 +289,7 @@@@ my ($r) = @@_; local $_; - my $uri = $r->uri; + my $uri = $r->location; my $cache = __PACKAGE__->registry_cache; my @@retval = "

Compiled registry scripts grouped by their handler

"; @@@@ -765,7 +765,7 @@@@ my ($self, $package, $r) = @@_; my @@m = qw(
); - my $uri = $r->uri; + my $uri = $r->location; my $is_main = $package eq "main"; my $do_dump = has($r, "dumper"); @ 1.3 log @Update from version 2.04nb4 to 2.04nb5. Pkgsrc changes: o Apply fix from svn repository to fix an XSS bug in Apache2::Status, ref. CVE-2009-0796. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update ap2-perl to mod_perl-1.99_12. * reams of bug fixes. See the Changes file. * works with perl-5.8.1. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2003/06/03 19:17:20 epg Exp $ d3 17 a19 25 --- lib/Apache/Build.pm.orig Fri Jan 10 23:16:12 2003 +++ lib/Apache/Build.pm @@@@ -771,6 +771,14 @@@@ my %wanted_apr_config = map { $_, 1} qw( HAS_INLINE HAS_FORK ); +sub get_apr_includes { + $_ = `apr-config --includes`; + chomp; + s/^\s*-I//; + s/\s*$//; + return $_; +} + sub get_apr_config { my $self = shift; @@@@ -779,7 +787,7 @@@@ sub get_apr_config { my $dir = $self->ap_includedir; my $header; - for my $d ($dir, "$dir/../srclib/apr/include") { + for my $d ($dir, "$dir/../srclib/apr/include", get_apr_includes()) { $header = "$d/apr.h"; last if -e $header; d21 26 a46 2 @@@@ -1150,6 +1158,8 @@@@ sub includes { my @@inc = $self->file_path("src/modules/perl", "xs"); d48 4 a51 3 push @@inc, $self->mp_include_dir; + + push @@inc, get_apr_includes(); d53 1 a53 2 unless ($self->ap_prefix_is_source_tree) { my $ainc = $self->apxs('-q' => 'INCLUDEDIR'); @ 1.1 log @Teach ap2-perl and ap2-php4 how to find apr's includes. They need to find this separately now that apr is provided in a separate package. @ text @d1 1 a1 1 $NetBSD$ @