Author: torsten
Date: Thu Jun 26 08:31:25 2008
New Revision: 671923
URL: http://svn.apache.org/viewvc?rev=671923&view=rev
Log:
more whitespace cleanups
Modified:
perl/modperl/branches/threading/t/apache/constants.t
perl/modperl/branches/threading/t/apache/content_length_header.t
perl/modperl/branches/threading/t/apr-ext/perlio.t
perl/modperl/branches/threading/t/apr-ext/uuid.t
perl/modperl/branches/threading/t/directive/perl.t
perl/modperl/branches/threading/t/filter/out_str_req_mix.t
perl/modperl/branches/threading/t/hooks/push_handlers.t
perl/modperl/branches/threading/t/modperl/cookie.t
perl/modperl/branches/threading/t/modperl/pnotes2.t
perl/modperl/branches/threading/t/modules/reload.t
perl/modperl/branches/threading/t/perl/hash_attack.t
perl/modperl/branches/threading/t/perl/ithreads3.t
perl/modperl/branches/threading/t/protocol/eliza.t
Modified: perl/modperl/branches/threading/t/apache/constants.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/apache/constants.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/apache/constants.t (original)
+++ perl/modperl/branches/threading/t/apache/constants.t Thu Jun 26 08:31:25
2008
@@ -9,7 +9,7 @@
# -compile puts constants into the Apache2:: namespace
use Apache2::Const -compile => qw(:http :common :mpmq :proxy
TAKE23 &OPT_EXECCGI
- DECLINE_CMD DIR_MAGIC_TYPE
+ DECLINE_CMD DIR_MAGIC_TYPE
CRLF);
# without -compile, constants are in the
@@ -30,11 +30,11 @@
ok t_cmp(Apache2::Const::HTTP_GONE, 410, 'Apache2::Const::HTTP_GONE');
-ok t_cmp(Apache2::Const::DIR_MAGIC_TYPE,
+ok t_cmp(Apache2::Const::DIR_MAGIC_TYPE,
'httpd/unix-directory',
'Apache2::Const::DIR_MAGIC_TYPE');
-ok t_cmp(Apache2::Const::MPMQ_MAX_SPARE_DAEMONS,
+ok t_cmp(Apache2::Const::MPMQ_MAX_SPARE_DAEMONS,
9,
'Apache2::Const::MPMQ_MAX_SPARE_DAEMONS');
Modified: perl/modperl/branches/threading/t/apache/content_length_header.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/apache/content_length_header.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/apache/content_length_header.t (original)
+++ perl/modperl/branches/threading/t/apache/content_length_header.t Thu Jun 26
08:31:25 2008
@@ -73,13 +73,13 @@
## to protect against wierd SVN checkout building.
## XXX: I'm starting to think this test is more
## trouble then its worth.
- if (have_min_apache_version("2.2.1")) {
+ if (have_min_apache_version("2.2.1")) {
$head_cl = 25;
}
elsif (have_min_apache_version("2.2.0")) {
# $head_cl = undef; # avoid warnings
}
- elsif (have_min_apache_version("2.0.56")) {
+ elsif (have_min_apache_version("2.0.56")) {
$head_cl = 25;
}
else {
Modified: perl/modperl/branches/threading/t/apr-ext/perlio.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/apr-ext/perlio.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/apr-ext/perlio.t (original)
+++ perl/modperl/branches/threading/t/apr-ext/perlio.t Thu Jun 26 08:31:25 2008
@@ -26,7 +26,7 @@
# prerequisite
# also need to check whether we build against the source tree, in
# which case we APR.so won't be linked against libapr/libaprutil
-my $has_apr_config = $build->{apr_config_path} &&
+my $has_apr_config = $build->{apr_config_path} &&
!$build->httpd_is_source_tree;
my $has_perlio_layers = 0;
@@ -231,11 +231,11 @@
}
-# XXX: need tests
+# XXX: need tests
# - for stdin/out/err as they are handled specially
# XXX: tmpfile is missing:
-# consider to use 5.8's syntax:
+# consider to use 5.8's syntax:
# open $fh, "+>", undef;
# cleanup: t_mkdir will remove the whole tree including the file
Modified: perl/modperl/branches/threading/t/apr-ext/uuid.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/apr-ext/uuid.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/apr-ext/uuid.t (original)
+++ perl/modperl/branches/threading/t/apr-ext/uuid.t Thu Jun 26 08:31:25 2008
@@ -17,7 +17,7 @@
#######
# my $build = Apache2::Build->build_config;
#
-# my $has_apr_config = $build->{apr_config_path} &&
+# my $has_apr_config = $build->{apr_config_path} &&
# !$build->httpd_is_source_tree;
# plan tests => TestAPRlib::uuid::num_of_tests(),
# need {"the build couldn't find apr-config" => $has_apr_config};
Modified: perl/modperl/branches/threading/t/directive/perl.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/directive/perl.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/directive/perl.t (original)
+++ perl/modperl/branches/threading/t/directive/perl.t Thu Jun 26 08:31:25 2008
@@ -11,7 +11,7 @@
my @auth = (Authorization => 'Basic ZG91Z206Zm9v'); #dougm:foo
-foreach my $location ("/perl_sections/index.html",
+foreach my $location ("/perl_sections/index.html",
"/perl_sections_readconfig/index.html") {
sok {
Modified: perl/modperl/branches/threading/t/filter/out_str_req_mix.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/filter/out_str_req_mix.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/filter/out_str_req_mix.t (original)
+++ perl/modperl/branches/threading/t/filter/out_str_req_mix.t Thu Jun 26
08:31:25 2008
@@ -16,5 +16,5 @@
my $received = POST_BODY $location, content => $content;
$received =~ s{\r?\n$}{};
-ok t_cmp($expected, $received,
+ok t_cmp($expected, $received,
"mixing output httpd and mod_perl filters, while preserving order");
Modified: perl/modperl/branches/threading/t/hooks/push_handlers.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/hooks/push_handlers.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/hooks/push_handlers.t (original)
+++ perl/modperl/branches/threading/t/hooks/push_handlers.t Thu Jun 26 08:31:25
2008
@@ -8,7 +8,7 @@
plan tests => 1;
-my @refs = qw(conf conf1 conf2 coderef
+my @refs = qw(conf conf1 conf2 coderef
full_coderef coderef1 coderef2 coderef3);
my @anon = qw(anonymous anonymous1 coderef4 anonymous3);
Modified: perl/modperl/branches/threading/t/modperl/cookie.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/modperl/cookie.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/modperl/cookie.t (original)
+++ perl/modperl/branches/threading/t/modperl/cookie.t Thu Jun 26 08:31:25 2008
@@ -10,7 +10,7 @@
# this test we call $r->subprocess_env, which adds them on demand, and
# we are able to get the cookie via %ENV.
#
-# the last sub-test makes sure that mod_cgi env vars don't persist
+# the last sub-test makes sure that mod_cgi env vars don't persist
# and are properly re-set at the end of each request.
#
# since the test is run against the same interpreter we also test that
Modified: perl/modperl/branches/threading/t/modperl/pnotes2.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/modperl/pnotes2.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/modperl/pnotes2.t (original)
+++ perl/modperl/branches/threading/t/modperl/pnotes2.t Thu Jun 26 08:31:25 2008
@@ -23,11 +23,6 @@
$u="$url?$i"; $ok=GET_BODY $u;
select undef, undef, undef, 0.2; # give it time to write the logfile
ok t_cmp scalar(grep {
- /pnotes are destroyed after cleanup passed/;
+ /pnotes are destroyed after cleanup passed/;
} t_finish_error_log_watch), 1, $u;
}
-
-# Local Variables: #
-# mode: cperl #
-# cperl-indent-level: 4 #
-# End: #
Modified: perl/modperl/branches/threading/t/modules/reload.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/modules/reload.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/modules/reload.t (original)
+++ perl/modperl/branches/threading/t/modules/reload.t Thu Jun 26 08:31:25 2008
@@ -72,7 +72,7 @@
{
my $expected = "unregistered OK";
- my $received = same_interp_req_body($same_interp, \&GET,
+ my $received = same_interp_req_body($same_interp, \&GET,
$location . '?last' );
$skip++ unless defined $received;
same_interp_skip_not_found(
@@ -98,7 +98,7 @@
our @methods = qw(simple const prototype subpackage);
-sub subpackage { return Apache2::Reload::Test::SubPackage::subpackage() }
+sub subpackage { return Apache2::Reload::Test::SubPackage::subpackage() }
sub run {
my $r = shift;
Modified: perl/modperl/branches/threading/t/perl/hash_attack.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/perl/hash_attack.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/perl/hash_attack.t (original)
+++ perl/modperl/branches/threading/t/perl/hash_attack.t Thu Jun 26 08:31:25
2008
@@ -8,7 +8,7 @@
use Apache::TestRequest 'GET_BODY_ASSERT';
-plan tests => 1,
+plan tests => 1,
need { "relevant only for perl 5.8.2 and higher" => ($] >= 5.008002) };
my $expected = "ok";
Modified: perl/modperl/branches/threading/t/perl/ithreads3.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/perl/ithreads3.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/perl/ithreads3.t (original)
+++ perl/modperl/branches/threading/t/perl/ithreads3.t Thu Jun 26 08:31:25 2008
@@ -12,17 +12,17 @@
sub u {Apache::TestRequest::module2url($module, {path=>$_[0]})}
sub t {
- my $rc;
- eval {
- local $SIG{ALRM}=sub {die "Timeout\n"};
- alarm 2;
+ my $rc;
eval {
- $rc=GET_BODY u(shift);
+ local $SIG{ALRM}=sub {die "Timeout\n"};
+ alarm 2;
+ eval {
+ $rc=GET_BODY u(shift);
+ };
+ alarm 0;
};
alarm 0;
- };
- alarm 0;
- return $rc;
+ return $rc;
}
t_debug("connecting to ".u(''));
@@ -34,7 +34,3 @@
ok t_cmp t('/perl-script?3'), 3, 'perl-script 3';
ok t_cmp t('/modperl?3'), 3, 'modperl 3';
-
-# Local Variables: #
-# mode: cperl #
-# End: #
Modified: perl/modperl/branches/threading/t/protocol/eliza.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/protocol/eliza.t?rev=671923&r1=671922&r2=671923&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/protocol/eliza.t (original)
+++ perl/modperl/branches/threading/t/protocol/eliza.t Thu Jun 26 08:31:25 2008
@@ -6,9 +6,9 @@
use Apache::TestUtil;
use Apache::TestRequest ();
-my @test_strings = ('Hello Eliza',
- 'How are you?',
- 'Why do I have core dumped?',
+my @test_strings = ('Hello Eliza',
+ 'How are you?',
+ 'Why do I have core dumped?',
'I feel like writing some tests today, what about you?',
'Good bye, Eliza');
