You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by to...@apache.org on 2008/06/26 15:45:50 UTC
svn commit: r671901 [2/2] - in /perl/modperl/branches/threading:
ModPerl-Registry/lib/ModPerl/ ModPerl-Registry/t/cgi-bin/
ModPerl-Registry/t/conf/ lib/Apache2/ lib/ModPerl/ t/conf/
t/filter/TestFilter/ t/hooks/TestHooks/ t/lib/TestAPRlib/ t/lib/TestCo...
Modified: perl/modperl/branches/threading/t/response/TestModperl/current_callback.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/current_callback.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/current_callback.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/current_callback.pm Thu Jun 26 06:45:47 2008
@@ -33,7 +33,7 @@
sub check {
my $expected = 'Perl' . shift() . 'Handler';
my $callback = ModPerl::Util::current_callback();
- die "expecting $expected callback, instead got $callback"
+ die "expecting $expected callback, instead got $callback"
unless $callback eq $expected;
#warn "in callback: $callback\n";
return Apache2::Const::OK;
Modified: perl/modperl/branches/threading/t/response/TestModperl/interpreter.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/interpreter.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/interpreter.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/interpreter.pm Thu Jun 26 06:45:47 2008
@@ -24,50 +24,50 @@
my $interp = ModPerl::Interpreter->current;
ok t_cmp(ref($interp), 'ModPerl::Interpreter',
- 'interp is a ModPerl::Interpreter');
+ 'interp is a ModPerl::Interpreter');
ok t_cmp($$interp==${ModPerl::Interpreter::current()}, !!1,
- 'ModPerl::Interpreter->current == ModPerl::Interpreter::current');
+ 'ModPerl::Interpreter->current == ModPerl::Interpreter::current');
my $mip = $interp->mip;
ok t_cmp(ref($mip), 'ModPerl::InterpPool',
- 'interp->mip is a ModPerl::InterpPool');
+ 'interp->mip is a ModPerl::InterpPool');
ok t_cmp(${$mip->server}==${$r->server}, !!1,
- 'mip->server == r->server');
+ 'mip->server == r->server');
ok t_cmp(ref($mip->parent), 'ModPerl::Interpreter',
- 'mip->parent is a ModPerl::Interpreter');
+ 'mip->parent is a ModPerl::Interpreter');
if($is_threaded) {
- ok t_cmp($interp->perl!=0, !!1, 'interp->perl');
- ok t_cmp($interp->num_requests>0, !!1, 'interp->num_requests');
- ok t_cmp($interp->refcnt>0, !!1, 'interp->refcnt');
+ ok t_cmp($interp->perl!=0, !!1, 'interp->perl');
+ ok t_cmp($interp->num_requests>0, !!1, 'interp->num_requests');
+ ok t_cmp($interp->refcnt>0, !!1, 'interp->refcnt');
- my $tipool = $mip->tipool;
+ my $tipool = $mip->tipool;
- ok t_cmp(ref($tipool), 'ModPerl::TiPool',
- 'mip->tipool is a ModPerl::TiPool');
+ ok t_cmp(ref($tipool), 'ModPerl::TiPool',
+ 'mip->tipool is a ModPerl::TiPool');
- ok t_cmp($tipool->in_use!=0, !!1, 'tipool->in_use');
+ ok t_cmp($tipool->in_use!=0, !!1, 'tipool->in_use');
- ok t_cmp($tipool->size!=0, !!1, 'tipool->size');
+ ok t_cmp($tipool->size!=0, !!1, 'tipool->size');
- my $tipcfg = $tipool->cfg;
+ my $tipcfg = $tipool->cfg;
- ok t_cmp(ref($tipcfg), 'ModPerl::TiPoolConfig',
- 'tipool->cfg is a ModPerl::TiPoolConfig');
+ ok t_cmp(ref($tipcfg), 'ModPerl::TiPoolConfig',
+ 'tipool->cfg is a ModPerl::TiPoolConfig');
- ok t_cmp($tipcfg->start!=0, !!1, 'tipcfg->start');
+ ok t_cmp($tipcfg->start!=0, !!1, 'tipcfg->start');
- ok t_cmp($tipcfg->min_spare!=0, !!1, 'tipcfg->min_spare');
+ ok t_cmp($tipcfg->min_spare!=0, !!1, 'tipcfg->min_spare');
- ok t_cmp($tipcfg->max_spare!=0, !!1, 'tipcfg->max_spare');
+ ok t_cmp($tipcfg->max_spare!=0, !!1, 'tipcfg->max_spare');
- ok t_cmp($tipcfg->max!=0, !!1, 'tipcfg->max');
+ ok t_cmp($tipcfg->max!=0, !!1, 'tipcfg->max');
- ok t_cmp($tipcfg->max_requests!=0, !!1, 'tipcfg->max_requests');
+ ok t_cmp($tipcfg->max_requests!=0, !!1, 'tipcfg->max_requests');
}
Apache2::Const::OK;
Modified: perl/modperl/branches/threading/t/response/TestModperl/local_env.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/local_env.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/local_env.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/local_env.pm Thu Jun 26 06:45:47 2008
@@ -22,16 +22,16 @@
my %copy_ENV = %ENV; ## this is not a deep copy;
- ok t_cmp($ENV{MOD_PERL_API_VERSION}, 2,
+ ok t_cmp($ENV{MOD_PERL_API_VERSION}, 2,
"\$ENV{MOD_PERL_API_VERSION} is 2 before local \%ENV");
{
local %ENV;
- ok t_cmp($ENV{MOD_PERL_API_VERSION}, undef,
+ ok t_cmp($ENV{MOD_PERL_API_VERSION}, undef,
"\$ENV{MOD_PERL_API_VERSION} is undef after local \%ENV");
- ok t_cmp(scalar keys %ENV, 0,
+ ok t_cmp(scalar keys %ENV, 0,
"\%ENV has 0 keys after local");
$ENV{LOCAL} = 1;
Modified: perl/modperl/branches/threading/t/response/TestModperl/method.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/method.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/method.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/method.pm Thu Jun 26 06:45:47 2008
@@ -40,7 +40,7 @@
ok t_cmp(
$r->uri,
- '/' . Apache::TestRequest::module2path($class),
+ '/' . Apache::TestRequest::module2path($class),
'$r->uri eq $location');
if ($is_obj) {
Modified: perl/modperl/branches/threading/t/response/TestModperl/perl_options2.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/perl_options2.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/perl_options2.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/perl_options2.pm Thu Jun 26 06:45:47 2008
@@ -52,7 +52,7 @@
ok t_cmp($s->is_perl_option_enabled('Response'), 1,
"Response is off under PerlOptions None");
-
+
return Apache2::Const::OK;
}
Modified: perl/modperl/branches/threading/t/response/TestModperl/pnotes.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/pnotes.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/pnotes.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/pnotes.pm Thu Jun 26 06:45:47 2008
@@ -16,7 +16,7 @@
# make it ok to call ok() here while plan()ing elsewhere
Apache::Test::init_test_pm($r);
-
+
Test::_reset_globals() if Test->can('_reset_globals');
$Test::ntest = 1 + (26 * ($r->args - 1));
$Test::planned = 26;
@@ -102,7 +102,7 @@
else {
skip ('skipping $dbh retrival test - no DBI or DBD::DBM');
skip ('skipping $dbh->quote() test - no DBI or DBD::DBM');
- }
+ }
}
# set pnotes so we can test unset on later connections
Modified: perl/modperl/branches/threading/t/response/TestModperl/pnotes2.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/pnotes2.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/pnotes2.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/pnotes2.pm Thu Jun 26 06:45:47 2008
@@ -41,37 +41,37 @@
if(!defined $r->args) {
} elsif($r->args == 1) {
- $r->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
+ $r->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
} elsif($r->args == 2) {
- $r->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
+ $r->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
} elsif($r->args == 3) {
- $r->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
- $r->pnotes(x2 => 2);
+ $r->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
+ $r->pnotes(x2 => 2);
} elsif($r->args == 4) {
- $r->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
- $r->pnotes->{x2} = 2;
+ $r->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
+ $r->pnotes->{x2} = 2;
} elsif($r->args == 5) {
- $r->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
- $r->pnotes->{x2} = 2;
+ $r->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
+ $r->pnotes->{x2} = 2;
} elsif($r->args == 6) {
- $r->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
- $r->pnotes(x2 => 2);
+ $r->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
+ $r->pnotes(x2 => 2);
} elsif($r->args == 7) {
- $r->connection->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
+ $r->connection->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
} elsif($r->args == 8) {
- $r->connection->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
+ $r->connection->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
} elsif($r->args == 9) {
- $r->connection->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
- $r->connection->pnotes(x2 => 2);
+ $r->connection->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
+ $r->connection->pnotes(x2 => 2);
} elsif($r->args == 10) {
- $r->connection->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
- $r->connection->pnotes->{x2} = 2;
+ $r->connection->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
+ $r->connection->pnotes->{x2} = 2;
} elsif($r->args == 11) {
- $r->connection->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
- $r->connection->pnotes->{x2} = 2;
+ $r->connection->pnotes(x1 => TestModerl::pnotes2::x->new(\&line));
+ $r->connection->pnotes->{x2} = 2;
} elsif($r->args == 12) {
- $r->connection->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
- $r->connection->pnotes(x2 => 2);
+ $r->connection->pnotes->{x1} = TestModerl::pnotes2::x->new(\&line);
+ $r->connection->pnotes(x2 => 2);
}
$r->content_type('text/plain');
Modified: perl/modperl/branches/threading/t/response/TestModperl/printf.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/printf.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/printf.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/printf.pm Thu Jun 26 06:45:47 2008
@@ -31,7 +31,7 @@
# ok 4 (gets input from the fixup handler via notes)
{
my $note = $r->notes->get("fixup") || '';
- my $ok = $note =~
+ my $ok = $note =~
/\$r->printf can't be called before the response phase/;
$r->print("not ") unless $ok;
$r->print("ok 4\n");
Modified: perl/modperl/branches/threading/t/response/TestModperl/request_rec_perlio_api.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/request_rec_perlio_api.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/request_rec_perlio_api.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/request_rec_perlio_api.pm Thu Jun 26 06:45:47 2008
@@ -93,7 +93,7 @@
# now close it completely and restore it, without using any dupped
# filehandle
close STDOUT;
- open STDOUT, ">:Apache2", $r
+ open STDOUT, ">:Apache2", $r
or die "can't open STDOUT via :Apache2 layer : $!";
print "next you reincarnate...";
Modified: perl/modperl/branches/threading/t/response/TestModperl/setupenv.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/setupenv.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/setupenv.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/setupenv.pm Thu Jun 26 06:45:47 2008
@@ -321,7 +321,7 @@
PerlSetEnv DIR_PERLSETENV psvoid
</Location>
- # equivalent to modperl handler with $r->subprocess_env() -
+ # equivalent to modperl handler with $r->subprocess_env() -
# CGI variables are there, but not subprocess_env entries
# that are populated after the void call
<Location /TestModperl__setupenv_psnosetupvoid>
Modified: perl/modperl/branches/threading/t/response/TestModperl/subenv.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModperl/subenv.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModperl/subenv.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModperl/subenv.pm Thu Jun 26 06:45:47 2008
@@ -32,7 +32,7 @@
ok ! $ENV{$key}; # %ENV not populated yet
}
- # subprocess_env in void context with no arguments
+ # subprocess_env in void context with no arguments
# populates the same as +SetEnv
{
my $env = $r->subprocess_env;
Modified: perl/modperl/branches/threading/t/response/TestModules/reload.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestModules/reload.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestModules/reload.pm (original)
+++ perl/modperl/branches/threading/t/response/TestModules/reload.pm Thu Jun 26 06:45:47 2008
@@ -32,7 +32,7 @@
#This one shouldn't be touched
package Apache2::Reload::Test::SubPackage;
-sub subpackage {
+sub subpackage {
if ($TestModules::reload::pass == '2') {
return 'subpackage';
}
Modified: perl/modperl/branches/threading/t/response/TestPerl/hash_attack.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestPerl/hash_attack.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestPerl/hash_attack.pm (original)
+++ perl/modperl/branches/threading/t/response/TestPerl/hash_attack.pm Thu Jun 26 06:45:47 2008
@@ -92,7 +92,7 @@
$stash->{$s}++;
debug sprintf "%2d: %5s, %10s, %s", $c, $s, $h, scalar(%$stash);
push @keys, $s;
- debug "The hash collision attack has been successful"
+ debug "The hash collision attack has been successful"
if Internals::HvREHASH(%$stash);
} continue {
$s++;
Modified: perl/modperl/branches/threading/t/response/TestPerl/ithreads.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestPerl/ithreads.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestPerl/ithreads.pm (original)
+++ perl/modperl/branches/threading/t/response/TestPerl/ithreads.pm Thu Jun 26 06:45:47 2008
@@ -62,9 +62,9 @@
$counter_priv += $counter_priv for 1..10;
{
- lock $counter_shar;
- $counter_shar += $counter_shar for 1..10;
- }
+ lock $counter_shar;
+ $counter_shar += $counter_shar for 1..10;
+ }
$thr->join;
ok t_cmp($counter_shar, 2**20, "shared counter");
Modified: perl/modperl/branches/threading/t/response/TestPerl/ithreads_eval.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestPerl/ithreads_eval.pm?rev=671901&r1=671900&r2=671901&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestPerl/ithreads_eval.pm (original)
+++ perl/modperl/branches/threading/t/response/TestPerl/ithreads_eval.pm Thu Jun 26 06:45:47 2008
@@ -3,7 +3,7 @@
# reproducing a bug in perl ithreads: [perl #34341]
# https://rt.perl.org/rt3/Ticket/Display.html?id=34341
#
-# $thr->join triggers the following leak:
+# $thr->join triggers the following leak:
# - due to to local $0, (its second MAGIC's MG_OBJ,
# you can see it in the output of Dump $0). This leak was first
# spotted in the RegistryCooker.pm which localizes $0