head	1.3;
access;
symbols;
locks; strict;
comment	@# @;


1.3
date	2009.05.19.21.15.09;	author rse;	state Exp;
branches;
next	1.2;
commitid	vsEbDqkkiRuzJwOt;

1.2
date	2008.06.07.17.04.47;	author rse;	state Exp;
branches;
next	1.1;
commitid	5ECarTmY9Esdt26t;

1.1
date	2007.06.28.07.10.22;	author rse;	state Exp;
branches;
next	;
commitid	bEfG9pW7ec4RgEns;


desc
@@


1.3
log
@apply CVE-2009-0796 patch
@
text
@Index: lib/Apache2/Status.pm
--- lib/Apache2/Status.pm.orig	2007-12-31 08:50:48 +0100
+++ lib/Apache2/Status.pm	2009-05-19 23:12:43 +0200
@@@@ -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('<p>');
         $r->print(
             map { qq[<a href="$uri?$_">$status{$_}</a><br />\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 = (
         '<table border="1">',
         "<tr>",
@@@@ -289,7 +289,7 @@@@
     my ($r) = @@_;
 
     local $_;
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my $cache = __PACKAGE__->registry_cache;
 
     my @@retval = "<h2>Compiled registry scripts grouped by their handler</h2>";
@@@@ -765,7 +765,7 @@@@
     my ($self, $package, $r) = @@_;
 
     my @@m = qw(<table>);
-    my $uri = $r->uri;
+    my $uri = $r->location;
     my $is_main = $package eq "main";
 
     my $do_dump = has($r, "dumper");
Index: lib/ModPerl/BuildMM.pm
--- lib/ModPerl/BuildMM.pm.orig	2007-12-31 08:50:47 +0100
+++ lib/ModPerl/BuildMM.pm	2009-05-19 23:12:43 +0200
@@@@ -359,7 +359,7 @@@@
 
     $apr_config ||= $build->get_apr_config();
 
-    if ($path =~ m/(Thread|Global)Mutex/) {
+    if ($path =~ m/(Thread|Global)(Mutex|RWLock)/) { 
         return unless $apr_config->{HAS_THREADS};
     }
 
Index: src/modules/perl/modperl_apache_compat.h
--- src/modules/perl/modperl_apache_compat.h.orig	2007-12-31 08:23:36 +0100
+++ src/modules/perl/modperl_apache_compat.h	2009-05-19 23:12:43 +0200
@@@@ -22,6 +22,7 @@@@
 #if !APR_HAS_THREADS
 typedef unsigned long apr_os_thread_t;
 typedef void * apr_thread_mutex_t;
+typedef void * apr_thread_rwlock_t;
 #endif
 
 /* back compat adjustements for older Apache versions
@


1.2
log
@finally upgrade to mod_perl 2.0.4
@
text
@d1 48
d51 1
a51 1
+++ lib/ModPerl/BuildMM.pm	2008-06-07 19:02:20 +0200
d63 1
a63 1
+++ src/modules/perl/modperl_apache_compat.h	2008-06-07 19:02:20 +0200
@


1.1
log
@apply a security (CVE-2007-1349) and bug fix
@
text
@d1 4
a4 5
Index: ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
--- ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.orig	2006-11-20 00:31:41 +0100
+++ ModPerl-Registry/lib/ModPerl/RegistryCooker.pm	2007-06-28 09:07:22 +0200
@@@@ -337,7 +337,7 @@@@
     my $self = shift;
d6 1
a6 5
     my $path_info = $self->{REQ}->path_info;
-    my $script_name = $path_info && $self->{URI} =~ /$path_info$/
+    my $script_name = $path_info && $self->{URI} =~ /\Q$path_info\E$/
         ? substr($self->{URI}, 0, length($self->{URI}) - length($path_info))
         : $self->{URI};
d8 4
a11 4
Index: xs/APR/APR/Makefile.PL
--- xs/APR/APR/Makefile.PL.orig	2006-11-20 00:31:02 +0100
+++ xs/APR/APR/Makefile.PL	2007-06-28 09:07:22 +0200
@@@@ -15,7 +15,7 @@@@
d13 9
a21 1
 my %args;
d23 1
a23 5
-%args = map { split /=/, $_ } @@ARGV;
+%args = map { split /=/, $_, 2 } @@ARGV;
 
 $args{NAME}         = 'APR';
 $args{VERSION_FROM} = 'APR.pm';
@