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