head	1.2;
access;
symbols
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1
	RELEASE_6_EOL:1.1
	RELEASE_8_1_0:1.1
	RELEASE_7_3_0:1.1
	RELEASE_8_0_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2011.05.22.22.05.07;	author ohauer;	state dead;
branches;
next	1.1;

1.1
date	2009.05.16.02.07.21;	author pgollucci;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- update to mod_perl-2.0.5

committed with hat apache@@

PR:		ports/155026 ports/155586 ports/157246
@
text
@--- lib/Apache2/Status.pm	2009/04/01 15:32:12	760925
+++ 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('<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");
@


1.1
log
@Pull r760926 from stream to fix CVE-2009-0796
This will be fixed in 2.0.5 and can be removed

SVN:        http://svn.apache.org/viewvc?rev=760926&view=rev
Security:   http://www.vuxml.org/freebsd/4a638895-41b7-11de-b1cc-00219b0fc4d8
@
text
@@

