Author: stevehay
Date: Thu Oct 31 23:38:32 2013
New Revision: 1537765
URL: http://svn.apache.org/r1537765
Log:
Merged revision(s) 671923 from perl/modperl/branches/threading:
more whitespace cleanups
........
Modified:
perl/modperl/branches/httpd24threading/ (props changed)
perl/modperl/branches/httpd24threading/t/modperl/pnotes2.t
perl/modperl/branches/httpd24threading/t/perl/ithreads3.t
Propchange: perl/modperl/branches/httpd24threading/
------------------------------------------------------------------------------
Merged /perl/modperl/branches/threading:r671923
Modified: perl/modperl/branches/httpd24threading/t/modperl/pnotes2.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/t/modperl/pnotes2.t?rev=1537765&r1=1537764&r2=1537765&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/t/modperl/pnotes2.t (original)
+++ perl/modperl/branches/httpd24threading/t/modperl/pnotes2.t Thu Oct 31
23:38:32 2013
@@ -26,8 +26,3 @@ for my $i (1..12) {
/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/httpd24threading/t/perl/ithreads3.t
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/t/perl/ithreads3.t?rev=1537765&r1=1537764&r2=1537765&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/t/perl/ithreads3.t (original)
+++ perl/modperl/branches/httpd24threading/t/perl/ithreads3.t Thu Oct 31
23:38:32 2013
@@ -12,17 +12,17 @@ my $module = 'TestPerl::ithreads3';
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('/modperl?2'), 5, 'modperl 2'
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: #
