Author: torsten
Date: Fri Aug 21 14:25:31 2009
New Revision: 806567
URL: http://svn.apache.org/viewvc?rev=806567&view=rev
Log:
Merged revisions 757553,758847,760926,763100,770015,774171 via svnmerge from
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........
r757553 | joes | 2009-03-23 22:28:38 +0100 (Mon, 23 Mar 2009) | 3 lines
whitespace for buildbot trigger
........
r758847 | gozer | 2009-03-26 21:49:51 +0100 (Thu, 26 Mar 2009) | 1 line
whitespace fix to test buildbot
........
r760926 | torsten | 2009-04-01 17:39:56 +0200 (Wed, 01 Apr 2009) | 1 line
Fix an XSS bug in Apache2::Status.
........
r763100 | phred | 2009-04-08 06:29:39 +0200 (Wed, 08 Apr 2009) | 2 lines
Apache::Bootstrap has hit CPAN.
........
r770015 | joes | 2009-04-30 02:20:23 +0200 (Thu, 30 Apr 2009) | 2 lines
whitespace to trigger buildbot
........
r774171 | gozer | 2009-05-13 04:40:20 +0200 (Wed, 13 May 2009) | 5 lines
We no longer have direct access to perl.apache.org. people.apache.org replaces
it for all release purposes, except it's on a delayed rsync from there to the
live site. Updating RELEASE instructions accordingly
........
Modified:
perl/modperl/branches/threading/ (props changed)
perl/modperl/branches/threading/Changes
perl/modperl/branches/threading/README-SVN
perl/modperl/branches/threading/RELEASE
perl/modperl/branches/threading/lib/Apache2/Status.pm
perl/modperl/branches/threading/todo/2.0.5
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 21 14:25:31 2009
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 21 14:25:31 2009
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-756400
+/perl/modperl/trunk:1-712967,712969-806477
Modified: perl/modperl/branches/threading/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/Changes?rev=806567&r1=806566&r2=806567&view=diff
==============================================================================
--- perl/modperl/branches/threading/Changes (original)
+++ perl/modperl/branches/threading/Changes Fri Aug 21 14:25:31 2009
@@ -31,6 +31,9 @@
=item 2.0.5-dev
+Fix an XSS issue in Apache2::Status reported by Richard J. Brain
+<[email protected]>. [Torsten Foertsch]
+
Add NOTICE file to the distribution. [Joe Schaefer]
Make sure Apache2::RequestIO::read doesn't clear the buffer on end of
Modified: perl/modperl/branches/threading/README-SVN
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/README-SVN?rev=806567&r1=806566&r2=806567&view=diff
==============================================================================
--- perl/modperl/branches/threading/README-SVN (original)
+++ perl/modperl/branches/threading/README-SVN Fri Aug 21 14:25:31 2009
@@ -56,3 +56,4 @@
svn for cvs users (including migration tools):
http://svnbook.red-bean.com/en/1.0/apa.html
+
Modified: perl/modperl/branches/threading/RELEASE
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/RELEASE?rev=806567&r1=806566&r2=806567&view=diff
==============================================================================
--- perl/modperl/branches/threading/RELEASE (original)
+++ perl/modperl/branches/threading/RELEASE Fri Aug 21 14:25:31 2009
@@ -102,14 +102,14 @@
4. Release the package and update links (e.g. mod_perl-2.0.5.tar.gz)
- a. upload to perl.apache.org:/www/perl.apache.org/dist/
+ a. upload to people.apache.org:/www/perl.apache.org/dist/
- % scp mod_perl-2.0.5.tar.gz perl.apache.org:/www/perl.apache.org/dist/
+ % scp mod_perl-2.0.5.tar.gz people.apache.org:/www/perl.apache.org/dist/
- b. ssh to perl.apache.org, unpack the package, update symlinks to the
+ b. ssh to people.apache.org, unpack the package, update symlinks to the
tar ball and unpacked distro:
- % ssh perl.apache.org
+ % ssh people.apache.org
% cd /www/perl.apache.org/dist/
% ln -sf mod_perl-2.0.5.tar.gz mod_perl-2.0-current.tar.gz
% tar -xzvf mod_perl-2.0.5.tar.gz
@@ -152,10 +152,10 @@
% pgps -b --armor mod_perl-2.0.5.tar.gz
- b. upload the generated sig file to perl.apache.org:
+ b. upload the generated sig file to people.apache.org:
- % scp mod_perl-2.0.5.tar.gz.asc perl.apache.org:/www/perl.apache.org/dist/
- % ssh perl.apache.org
+ % scp mod_perl-2.0.5.tar.gz.asc
people.apache.org:/www/perl.apache.org/dist/
+ % ssh people.apache.org
% cd /www/perl.apache.org/dist/
% chmod 0664 mod_perl-2.0.5.tar.gz.asc
% ln -sf mod_perl-2.0.5.tar.gz.asc mod_perl-2.0-current.tar.gz.asc
Modified: perl/modperl/branches/threading/lib/Apache2/Status.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/lib/Apache2/Status.pm?rev=806567&r1=806566&r2=806567&view=diff
==============================================================================
--- perl/modperl/branches/threading/lib/Apache2/Status.pm (original)
+++ perl/modperl/branches/threading/lib/Apache2/Status.pm Fri Aug 21 14:25:31
2009
@@ -30,7 +30,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");
@@ -127,7 +127,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
@@ -199,7 +199,7 @@
sub status_inc {
my ($r) = @_;
- my $uri = $r->uri;
+ my $uri = $r->location;
my @retval = (
'<table border="1">',
"<tr>",
@@ -290,7 +290,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>";
@@ -766,7 +766,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");
Modified: perl/modperl/branches/threading/todo/2.0.5
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/todo/2.0.5?rev=806567&r1=806566&r2=806567&view=diff
==============================================================================
--- perl/modperl/branches/threading/todo/2.0.5 (original)
+++ perl/modperl/branches/threading/todo/2.0.5 Fri Aug 21 14:25:31 2009
@@ -10,4 +10,3 @@
=============
- Smolder, https://issues.apache.org/jira/browse/INFRA-1612 [pgollucci, ]
-
