Author: phred
Date: Wed Apr 22 02:06:35 2009
New Revision: 767344
URL: http://svn.apache.org/viewvc?rev=767344&view=rev
Log:
http://rt.cpan.org/Public/Bug/Display.html?id=41239
Fix submitted by: ozw1z5rd <alessio.palma [...] staff.dada.net>
Reviewed by: Fred Moyer
Reviewed by: Adam Prime
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestRun.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=767344&r1=767343&r2=767344&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Wed Apr 22 02:06:35 2009
@@ -8,6 +8,10 @@
=item 1.31-dev
+PR: 41239
+t/TEST -ping does not return a valid return code to the calling shell
+[ozw1z5rd <alessio.palma@staff.dada.net>]
+
Prevent infinite loop when no default apxs or httpd is present and repeated
attempts to run the test suite under an automated harness (such as a cpan
smoke test). Issue reported by CORION and ANDK, PR: 12911
@@ -19,7 +23,7 @@
when mod_cgi.c is the desired requirement.
[Fred Moyer <phred@apache.org>]
-Fix overriden get_basic_credentials test when using NTLM authentication
+Fix overridden get_basic_credentials test when using NTLM authentication
[Rick Frankel <cpan@rickster.com>]
Work around a bug introduced in libwww-perl in version
Modified: perl/Apache-Test/trunk/lib/Apache/TestRun.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRun.pm?rev=767344&r1=767343&r2=767344&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRun.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRun.pm Wed Apr 22 02:06:35 2009
@@ -1173,6 +1173,7 @@
}
else {
warning "no server is running on $name";
+ exit_perl(0);
}
return $exit; #means call exit() if true
Author: phred
Date: Sat Apr 18 21:13:35 2009
New Revision: 766395
URL: http://svn.apache.org/viewvc?rev=766395&view=rev
Log:
add another closing bracket that was missing
Modified:
perl/Apache-Test/trunk/Changes
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=766395&r1=766394&r2=766395&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Sat Apr 18 21:13:35 2009
@@ -24,7 +24,7 @@
Work around a bug introduced in libwww-perl in version
5.820 for httpd's credentials
-[Gunnar Wolf <gwolf@gwolf.org>, Niko Tyni <ntyni@debian.org>
+[Gunnar Wolf <gwolf@gwolf.org>, Niko Tyni <ntyni@debian.org>]
Make Apache::TestConfig::untaint_path tolerate undefined arguments
[Torsten Foertsch <torsten.foertsch@gmx.net]
Author: phred
Date: Sat Apr 18 21:00:21 2009
New Revision: 766393
URL: http://svn.apache.org/viewvc?rev=766393&view=rev
Log:
Add closing > mailto tag
Modified:
perl/Apache-Test/trunk/Changes
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=766393&r1=766392&r2=766393&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Sat Apr 18 21:00:21 2009
@@ -11,13 +11,13 @@
Prevent infinite loop when no default apxs or httpd is present and repeated
attempts to run the test suite under an automated harness (such as a cpan
smoke test). Issue reported by CORION and ANDK, PR: 12911
-[Fred Moyer <fred@redhotpenguin.com]
+[Fred Moyer <phred@apache.org>]
Use need_module('mod_cgi.c') and need_module('mod_cgid.c') in
t/next_available_port.t instead of need_cgi. On case insensitive file
systems such as OS X, need_cgi will fulfill the requirement with cgi.pm,
when mod_cgi.c is the desired requirement.
-[Fred Moyer <fred@redhotpenguin.com]
+[Fred Moyer <phred@apache.org>]
Fix overriden get_basic_credentials test when using NTLM authentication
[Rick Frankel <cpan@rickster.com>]
Author: phred
Date: Sat Apr 18 10:00:22 2009
New Revision: 766285
URL: http://svn.apache.org/viewvc?rev=766285&view=rev
Log:
Merge earlier changes which I mistakenly committed to tag 1_30.
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
perl/Apache-Test/trunk/lib/Apache/TestRequest.pm
perl/Apache-Test/trunk/t/next_available_port.t
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=766285&r1=766284&r2=766285&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Sat Apr 18 10:00:22 2009
@@ -8,6 +8,20 @@
=item 1.31-dev
+Prevent infinite loop when no default apxs or httpd is present and repeated
+attempts to run the test suite under an automated harness (such as a cpan
+smoke test). Issue reported by CORION and ANDK, PR: 12911
+[Fred Moyer <fred@redhotpenguin.com]
+
+Use need_module('mod_cgi.c') and need_module('mod_cgid.c') in
+t/next_available_port.t instead of need_cgi. On case insensitive file
+systems such as OS X, need_cgi will fulfill the requirement with cgi.pm,
+when mod_cgi.c is the desired requirement.
+[Fred Moyer <fred@redhotpenguin.com]
+
+Fix overriden get_basic_credentials test when using NTLM authentication
+[Rick Frankel <cpan@rickster.com>]
+
Work around a bug introduced in libwww-perl in version
5.820 for httpd's credentials
[Gunnar Wolf <gwolf@gwolf.org>, Niko Tyni <ntyni@debian.org>
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?rev=766285&r1=766284&r2=766285&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Sat Apr 18 10:00:22 2009
@@ -2407,7 +2407,17 @@
$prompt .= ":\n\n";
}
+ my $i = 0;
while (1) {
+
+ # prevent infinite loops in smoke tests, only give the user
+ # five chances to specify httpd or apxs before giving up
+ if ($i++ == 5) {
+
+ Apache::TestRun::skip_test_suite('y');
+ return;
+ }
+
$ans = ExtUtils::MakeMaker::prompt($prompt, $default);
# strip leading/closing spaces
Modified: perl/Apache-Test/trunk/lib/Apache/TestRequest.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRequest.pm?rev=766285&r1=766284&r2=766285&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRequest.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRequest.pm Sat Apr 18 10:00:22 2009
@@ -265,7 +265,7 @@
my($self, $realm, $uri, $proxy) = @_;
for ($realm, '__ALL__') {
- next unless $credentials{$_};
+ next unless $_ && $credentials{$_};
return @{ $credentials{$_} };
}
Modified: perl/Apache-Test/trunk/t/next_available_port.t
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/t/next_available_port.t?rev=766285&r1=766284&r2=766285&view=diff
==============================================================================
--- perl/Apache-Test/trunk/t/next_available_port.t (original)
+++ perl/Apache-Test/trunk/t/next_available_port.t Sat Apr 18 10:00:22 2009
@@ -7,7 +7,9 @@
use Apache::TestRequest;
use Apache::TestUtil;
-plan tests => 1, need need_cgi, need_module('mod_env.c');
+plan tests => 1, need need_module('mod_cgi.c'),
+ need_module('mod_cgid.c'),
+ need_module('mod_env.c');
my $url = '/cgi-bin/next_available_port.pl';
Author: phred
Date: Sat Apr 18 09:48:19 2009
New Revision: 766281
URL: http://svn.apache.org/viewvc?rev=766281&view=rev
Log:
Revert earlier change - my environment was on the 1_30 tag, not trunk
Modified:
perl/Apache-Test/tags/1_30/Changes
perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm
Modified: perl/Apache-Test/tags/1_30/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/Changes?rev=766281&r1=766280&r2=766281&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/Changes (original)
+++ perl/Apache-Test/tags/1_30/Changes Sat Apr 18 09:48:19 2009
@@ -8,11 +8,6 @@
=item 1.31-dev
-Prevent infinite loop when no default apxs or httpd is present and repeated
-attempts to run the test suite under an automated harness (such as a cpan
-smoke test). Issue reported by CORION and ANDK, PR: 12911
-[Fred Moyer <fred@redhotpenguin.com]
-
Use need_module('mod_cgi.c') and need_module('mod_cgid.c') in
t/next_available_port.t instead of need_cgi. On case insensitive file
systems such as OS X, need_cgi will fulfill the requirement with cgi.pm,
Modified: perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm?rev=766281&r1=766280&r2=766281&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm Sat Apr 18 09:48:19 2009
@@ -2406,18 +2406,7 @@
$prompt .= ":\n\n";
}
- my $i = 0;
while (1) {
-
- # prevent infinite loops in smoke tests, only give the user
- # five chances to specify httpd or apxs before giving up
- if ($i++ == 5) {
-
- Apache::TestRun::skip_test_suite('y');
- return;
- }
-
-
$ans = ExtUtils::MakeMaker::prompt($prompt, $default);
# strip leading/closing spaces
Author: phred
Date: Sat Apr 18 09:40:00 2009
New Revision: 766280
URL: http://svn.apache.org/viewvc?rev=766280&view=rev
Log:
Resolve RT ticket 12911 where an infinite loops is created with no
httpd or apxs when run under a smoke test. Thanks to Corion for the
spot.
Modified:
perl/Apache-Test/tags/1_30/Changes
perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm
Modified: perl/Apache-Test/tags/1_30/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/Changes?rev=766280&r1=766279&r2=766280&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/Changes (original)
+++ perl/Apache-Test/tags/1_30/Changes Sat Apr 18 09:40:00 2009
@@ -8,6 +8,11 @@
=item 1.31-dev
+Prevent infinite loop when no default apxs or httpd is present and repeated
+attempts to run the test suite under an automated harness (such as a cpan
+smoke test). Issue reported by CORION and ANDK, PR: 12911
+[Fred Moyer <fred@redhotpenguin.com]
+
Use need_module('mod_cgi.c') and need_module('mod_cgid.c') in
t/next_available_port.t instead of need_cgi. On case insensitive file
systems such as OS X, need_cgi will fulfill the requirement with cgi.pm,
Modified: perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm?rev=766280&r1=766279&r2=766280&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm Sat Apr 18 09:40:00 2009
@@ -2406,7 +2406,18 @@
$prompt .= ":\n\n";
}
+ my $i = 0;
while (1) {
+
+ # prevent infinite loops in smoke tests, only give the user
+ # five chances to specify httpd or apxs before giving up
+ if ($i++ == 5) {
+
+ Apache::TestRun::skip_test_suite('y');
+ return;
+ }
+
+
$ans = ExtUtils::MakeMaker::prompt($prompt, $default);
# strip leading/closing spaces
Author: phred
Date: Sun Apr 12 22:36:15 2009
New Revision: 764342
URL: http://svn.apache.org/viewvc?rev=764342&view=rev
Log:
Fix test failure on platforms with case insensitive filesystems
and where mod_cgi.c is not installed as an httpd module.
Modified:
perl/Apache-Test/tags/1_30/Changes
perl/Apache-Test/tags/1_30/t/next_available_port.t
Modified: perl/Apache-Test/tags/1_30/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/Changes?rev=764342&r1=764341&r2=764342&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/Changes (original)
+++ perl/Apache-Test/tags/1_30/Changes Sun Apr 12 22:36:15 2009
@@ -8,6 +8,12 @@
=item 1.31-dev
+Use need_module('mod_cgi.c') and need_module('mod_cgid.c') in
+t/next_available_port.t instead of need_cgi. On case insensitive file
+systems such as OS X, need_cgi will fulfill the requirement with cgi.pm,
+when mod_cgi.c is the desired requirement.
+[Fred Moyer <fred@redhotpenguin.com]
+
Fix overriden get_basic_credentials test when using NTLM authentication
[Rick Frankel <cpan@rickster.com>]
Modified: perl/Apache-Test/tags/1_30/t/next_available_port.t
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/t/next_available_port.t?rev=764342&r1=764341&r2=764342&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/t/next_available_port.t (original)
+++ perl/Apache-Test/tags/1_30/t/next_available_port.t Sun Apr 12 22:36:15 2009
@@ -7,7 +7,9 @@
use Apache::TestRequest;
use Apache::TestUtil;
-plan tests => 1, need need_cgi, need_module('mod_env.c');
+plan tests => 1, need need_module('mod_cgi.c'),
+ need_module('mod_cgid.c'),
+ need_module('mod_env.c');
my $url = '/cgi-bin/next_available_port.pl';
Author: phred
Date: Sun Apr 12 20:57:04 2009
New Revision: 764326
URL: http://svn.apache.org/viewvc?rev=764326&view=rev
Log:
Bump version to 1.31-dev.
Modified:
perl/Apache-Test/tags/1_30/RELEASE
perl/Apache-Test/tags/1_30/lib/Apache/Test.pm
Modified: perl/Apache-Test/tags/1_30/RELEASE
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/RELEASE?rev=764326&r1=764325&r2=764326&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/RELEASE (original)
+++ perl/Apache-Test/tags/1_30/RELEASE Sun Apr 12 20:57:04 2009
@@ -30,7 +30,7 @@
(or maybe longer to give most people a chance to catch up). no need
to tag this package
- Subject: [RELEASE CANDIDATE] Apache-Test-1.30 RC\d+
+ Subject: [RELEASE CANDIDATE] Apache-Test-1.31 RC\d+
a. if problems are detected during stage 2, repeat stages 1 and 2.
@@ -62,7 +62,7 @@
5. Announce the package
a. post ... to the modperl, announce lists
- Subject: [ANNOUNCE] Apache-Test 1.30
+ Subject: [ANNOUNCE] Apache-Test 1.31
include
- MD5 sig (as it comes from CPAN upload announce).
- the latest Changes
@@ -74,7 +74,7 @@
b. edit ./Changes:
- start a new item with incremented version + '-dev'
- =item 1.31-dev
+ =item 1.32-dev
c. bump up version numbers in this file to make it easier to do the
next release.
Modified: perl/Apache-Test/tags/1_30/lib/Apache/Test.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/lib/Apache/Test.pm?rev=764326&r1=764325&r2=764326&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/lib/Apache/Test.pm (original)
+++ perl/Apache-Test/tags/1_30/lib/Apache/Test.pm Sun Apr 12 20:57:04 2009
@@ -36,7 +36,7 @@
use vars qw(@ISA @EXPORT %EXPORT_TAGS $VERSION %SubTests @SkipReasons);
-$VERSION = '1.30';
+$VERSION = '1.31-dev';
my @need = qw(need_lwp need_http11 need_cgi need_access need_auth
need_module need_apache need_min_apache_version
Author: pgollucci
Date: Mon Dec 22 14:20:57 2008
New Revision: 728811
URL: http://svn.apache.org/viewvc?rev=728811&view=rev
Log:
Fix broken tests due to a bug in libwww-perl 5.820.
t/hooks/authz....
1..4
# Running under perl version 5.010000 for linux
# Current time local: Mon Dec 22 10:34:54 2008
# Current time GMT: Mon Dec 22 16:34:54 2008
# Using Test.pm version 1.25
# Using Apache/Test.pm version 1.31
ok 1
ok 2
ok 3
not ok 4
# Failed test 4 in t/hooks/authz.t at line 19
Reported by: Gunnar Wolf <gwolf@gwolf.org>
Submited by: Niko Tyni <ntyni@debian.org>
Reviewed by: pgollucci
Message Id: <20081222211400.GA3956@rebekka>
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestRequest.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=728811&r1=728810&r2=728811&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Mon Dec 22 14:20:57 2008
@@ -8,6 +8,10 @@
=item 1.31-dev
+Work around a bug introduced in libwww-perl in version
+5.820 for httpd's credentials
+[Gunnar Wolf <gwolf@gwolf.org>, Niko Tyni <ntyni@debian.org>
+
Make Apache::TestConfig::untaint_path tolerate undefined arguments
[Torsten Foertsch <torsten.foertsch@gmx.net]
Modified: perl/Apache-Test/trunk/lib/Apache/TestRequest.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRequest.pm?rev=728811&r1=728810&r2=728811&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRequest.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRequest.pm Mon Dec 22 14:20:57 2008
@@ -256,6 +256,11 @@
$self;
}
+sub credentials {
+ my $self = shift;
+ return $self->get_basic_credentials(@_);
+}
+
sub get_basic_credentials {
my($self, $realm, $uri, $proxy) = @_;
Author: torsten
Date: Wed Jul 16 05:45:31 2008
New Revision: 677266
URL: http://svn.apache.org/viewvc?rev=677266&view=rev
Log:
Make Apache::TestConfig::untaint_path tolerate undefined arguments
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=677266&r1=677265&r2=677266&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Wed Jul 16 05:45:31 2008
@@ -8,6 +8,9 @@
=item 1.31-dev
+Make Apache::TestConfig::untaint_path tolerate undefined arguments
+[Torsten Foertsch <torsten.foertsch@gmx.net]
+
Inherit LoadFile directives from the global httpd.conf
[Torsten Foertsch <torsten.foertsch@gmx.net]
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?rev=677266&r1=677265&r2=677266&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Wed Jul 16 05:45:31 2008
@@ -1769,6 +1769,7 @@
# return an untainted PATH
sub untaint_path {
my $path = shift;
+ return '' unless defined $path;
($path) = ( $path =~ /(.*)/ );
# win32 uses ';' for a path separator, assume others use ':'
my $sep = WIN32 ? ';' : ':';
Author: torsten
Date: Wed Jul 16 00:36:02 2008
New Revision: 677183
URL: http://svn.apache.org/viewvc?rev=677183&view=rev
Log:
Inherit LoadFile directives from the global httpd.conf
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=677183&r1=677182&r2=677183&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Wed Jul 16 00:36:02 2008
@@ -8,6 +8,9 @@
=item 1.31-dev
+Inherit LoadFile directives from the global httpd.conf
+[Torsten Foertsch <torsten.foertsch@gmx.net]
+
Don't overwrite php.ini if it already exists
PR: 32994
[MAHEX <MAHEX@cpan.org>]
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm?rev=677183&r1=677182&r2=677183&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm Wed Jul 16 00:36:02 2008
@@ -33,7 +33,7 @@
my %wanted_config = (
TAKE1 => {map { $_, 1 } qw(ServerRoot ServerAdmin TypesConfig DocumentRoot)},
- TAKE2 => {map { $_, 1 } qw(LoadModule)},
+ TAKE2 => {map { $_, 1 } qw(LoadModule LoadFile)},
);
my %spec_init = (
@@ -46,6 +46,7 @@
ServerRoot => sub {}, #dont override $self->{vars}->{serverroot}
DocumentRoot => \&inherit_directive_var,
LoadModule => \&inherit_load_module,
+ LoadFile => \&inherit_load_file,
);
#where to add config, default is preamble
@@ -247,6 +248,32 @@
}
}
+#inherit LoadFile
+sub inherit_load_file {
+ my($self, $c, $directive) = @_;
+
+ for my $args (@{ $c->{$directive} }) {
+ my $file = $self->server_file_rel2abs($args->[0]);
+
+ unless (-e $file) {
+ debug "$file does not exist, skipping LoadFile";
+ next;
+ }
+
+ if ($self->should_skip_module($args->[0])) {
+ debug "Skipping LoadFile of $args->[0]";
+ next;
+ }
+
+ # remember all found modules
+ push @{$self->{load_file}}, $file;
+
+ debug "LoadFile $file";
+
+ $self->preamble_first(qq{LoadFile "$file"\n});
+ }
+}
+
sub parse_take1 {
my($self, $c, $directive) = @_;
$c->{$directive} = strip_quotes;
Author: phred
Date: Fri May 30 15:27:55 2008
New Revision: 661903
URL: http://svn.apache.org/viewvc?rev=661903&view=rev
Log:
Fix overriden get_basic_credentials test when using NTLM authentication
Submitted By: Rick Frankel <cpan@rickster.com>
Reviewed By: Fred Moyer <fred@redhotpenguin.com>
Modified:
perl/Apache-Test/tags/1_30/Changes
perl/Apache-Test/tags/1_30/lib/Apache/TestRequest.pm
Modified: perl/Apache-Test/tags/1_30/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/Changes?rev=661903&r1=661902&r2=661903&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/Changes (original)
+++ perl/Apache-Test/tags/1_30/Changes Fri May 30 15:27:55 2008
@@ -6,6 +6,11 @@
=over 3
+=item 1.31-dev
+
+Fix overriden get_basic_credentials test when using NTLM authentication
+[Rick Frankel <cpan@rickster.com>]
+
=item 1.30 November 26, 2007
Added t_write_test_lib for temporary testing packages
Modified: perl/Apache-Test/tags/1_30/lib/Apache/TestRequest.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/lib/Apache/TestRequest.pm?rev=661903&r1=661902&r2=661903&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/lib/Apache/TestRequest.pm (original)
+++ perl/Apache-Test/tags/1_30/lib/Apache/TestRequest.pm Fri May 30 15:27:55 2008
@@ -260,7 +260,7 @@
my($self, $realm, $uri, $proxy) = @_;
for ($realm, '__ALL__') {
- next unless $credentials{$_};
+ next unless $_ && $credentials{$_};
return @{ $credentials{$_} };
}
Author: pgollucci
Date: Mon May 12 14:46:50 2008
New Revision: 655659
URL: http://svn.apache.org/viewvc?rev=655659&view=rev
Log:
PR: 32994
Submitted by: MAHEX <MAHEX@cpan.org>
Reviewed by: pgollucci
Tweaked by: pgollucci
Don't over write php.ini if it already exists
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=655659&r1=655658&r2=655659&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Mon May 12 14:46:50 2008
@@ -8,6 +8,9 @@
=item 1.31-dev
+Don't overwrite php.ini if it already exists
+PR: 32994
+[MAHEX <MAHEX@cpan.org>]
=item 1.30 November 26, 2007
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm?rev=655659&r1=655658&r2=655659&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm Mon May 12 14:46:50 2008
@@ -169,6 +169,9 @@
my $dir = catfile $self->{vars}->{serverroot}, 'conf';
my $file = catfile $dir, 'php.ini';
+
+ return if -e $file
+
my $log = catfile $self->{vars}->{t_logs}, 'error_log';
$self->gendir($dir);
Author: pgollucci
Date: Mon May 12 14:43:36 2008
New Revision: 655658
URL: http://svn.apache.org/viewvc?rev=655658&view=rev
Log:
Update to PHP 5.2.5
Modified:
perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm?rev=655658&r1=655657&r2=655658&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm Mon May 12 14:43:36 2008
@@ -228,6 +228,7 @@
; used in place of your locally installed php.ini file
; as part of the pristine environment Apache-Test creates
; for you
+; [NOTE]: cat php.ini-recommended | grep -v '^;' | sed -e '/^$/d'
;
; exceptions to php.ini-recommended are as follows:
display_startup_errors = On
@@ -241,11 +242,10 @@
[PHP]
engine = On
zend.ze1_compatibility_mode = Off
-short_open_tag = On
+short_open_tag = Off
asp_tags = Off
precision = 14
y2k_compliance = On
-;output_buffering = 4096
zlib.output_compression = Off
implicit_flush = Off
unserialize_callback_func=
@@ -260,12 +260,11 @@
disable_functions =
disable_classes =
expose_php = On
-max_execution_time = 30
-max_input_time = 60
-memory_limit = 8M
+max_execution_time = 30 ; Maximum execution time of each script, in seconds
+max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
+memory_limit = 128M ; Maximum amount of memory a script may consume (128MB)
error_reporting = E_ALL
display_errors = Off
-;display_startup_errors = Off
log_errors = On
log_errors_max_len = 1024
ignore_repeated_errors = Off
@@ -276,6 +275,7 @@
register_globals = Off
register_long_arrays = Off
register_argc_argv = Off
+auto_globals_jit = On
post_max_size = 8M
magic_quotes_gpc = Off
magic_quotes_runtime = Off
@@ -285,12 +285,18 @@
default_mimetype = "text/html"
doc_root =
user_dir =
-extension_dir = "./"
enable_dl = On
file_uploads = On
upload_max_filesize = 2M
allow_url_fopen = On
+allow_url_include = Off
default_socket_timeout = 60
+[Date]
+[filter]
+[iconv]
+[sqlite]
+[xmlrpc]
+[Pcre]
[Syslog]
define_syslog_variables = Off
[mail function]
@@ -316,18 +322,19 @@
mysql.default_password =
mysql.connect_timeout = 60
mysql.trace_mode = Off
-[MySQLI]
+[MySQLi]
mysqli.max_links = -1
mysqli.default_port = 3306
mysqli.default_socket =
mysqli.default_host =
mysqli.default_user =
-mysqli.default_password =
+mysqli.default_pw =
mysqli.reconnect = Off
[mSQL]
msql.allow_persistent = On
msql.max_persistent = -1
msql.max_links = -1
+[OCI8]
[PostgresSQL]
pgsql.allow_persistent = On
pgsql.auto_reset_persistent = Off
@@ -348,8 +355,6 @@
sybct.max_links = -1
sybct.min_server_severity = 10
sybct.min_client_severity = 10
-[dbx]
-dbx.colnames_case = "lowercase"
[bcmath]
bcmath.scale = 0
[browscap]
@@ -373,6 +378,7 @@
session.cookie_lifetime = 0
session.cookie_path = /
session.cookie_domain =
+session.cookie_httponly =
session.serialize_handler = php
session.gc_probability = 1
session.gc_divisor = 1000
@@ -397,22 +403,10 @@
mssql.compatability_mode = Off
mssql.secure_connection = Off
[Assertion]
-[Ingres II]
-ingres.allow_persistent = On
-ingres.max_persistent = -1
-ingres.max_links = -1
-ingres.default_database =
-ingres.default_user =
-ingres.default_password =
-[Verisign Payflow Pro]
-pfpro.defaulthost = "test-payflow.verisign.com"
-pfpro.defaultport = 443
-pfpro.defaulttimeout = 30
-[Sockets]
-sockets.use_system_read = On
-[com]
+[COM]
[mbstring]
[FrontBase]
+[gd]
[exif]
[Tidy]
tidy.clean_output = Off
Author: geoff
Date: Wed Jan 2 13:05:30 2008
New Revision: 608229
URL: http://svn.apache.org/viewvc?rev=608229&view=rev
Log:
add generated cruft files to the rm list
Modified:
perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm?rev=608229&r1=608228&r2=608229&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm Wed Jan 2 13:05:30 2008
@@ -185,7 +185,7 @@
\$(APXS) $dversion $extra -I$self->{cmodules_dir} -c $name.c
clean:
- -rm -rf $name.o $name.lo $name.slo $name.la .libs
+ -rm -rf $name.o $name.lo $name.slo $name.la $name.i $name.s $name.gcno .libs
EOF
close $fh or die "close $makefile: $!";
Author: gozer
Date: Mon Dec 31 00:00:09 2007
New Revision: 607695
URL: http://svn.apache.org/viewvc?rev=607695&view=rev
Log:
*Whitespace*
Cleanup trailing whitespace, whitespace-only lines and litteral
tab characters.
Reviewed-By: gozer
Submitted-by: Torsten Foertsch <torsten.foertsch@gmx.net>
Message-Id: <200712031336.22019.torsten.foertsch@gmx.net>
Modified:
perl/Apache-Test/trunk/Apache-TestItSelf/lib/MyTest/Util.pm
perl/Apache-Test/trunk/lib/Apache/Test.pm
perl/Apache-Test/trunk/lib/Apache/TestClient.pm
perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm
perl/Apache-Test/trunk/lib/Apache/TestHarness.pm
perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm
perl/Apache-Test/trunk/lib/Apache/TestMB.pm
perl/Apache-Test/trunk/lib/Apache/TestRequest.pm
perl/Apache-Test/trunk/lib/Apache/TestRun.pm
perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm
perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm
perl/Apache-Test/trunk/lib/Apache/TestServer.pm
perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm
perl/Apache-Test/trunk/lib/Apache/TestTrace.pm
perl/Apache-Test/trunk/lib/Apache/TestUtil.pm
Modified: perl/Apache-Test/trunk/Apache-TestItSelf/lib/MyTest/Util.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Apache-TestItSelf/lib/MyTest/Util.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Apache-TestItSelf/lib/MyTest/Util.pm (original)
+++ perl/Apache-Test/trunk/Apache-TestItSelf/lib/MyTest/Util.pm Mon Dec 31 00:00:09 2007
@@ -136,9 +136,9 @@
timeout => 200,
makepl_arg => 'MOD_PERL=2 -libmodperl mod_perl-5.8.5-ithread.so',
);
-
+
my $path = "/home/$ENV{USER}/httpd";
-
+
@Apache::TestItSelf::Configs = (
{
apxs_exec => "$path/prefork/bin/apxs",
Modified: perl/Apache-Test/trunk/lib/Apache/Test.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/Test.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/Test.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/Test.pm Mon Dec 31 00:00:09 2007
@@ -28,7 +28,7 @@
# check first (and we choose mp2) $mod_perl::VERSION == 2.0
# just because someone loaded Apache::Test. This Is Bad. so,
# let's try to correct for that here by removing mod_perl from
- # %INC after the above use() statements settle in. nobody
+ # %INC after the above use() statements settle in. nobody
# should be relying on us loading up mod_perl.pm anyway...
delete $INC{'mod_perl.pm'};
@@ -73,9 +73,9 @@
if (($_[0] and $_[0] =~ m/^-withtestmore/) || @testmore) {
# special hoops for Test::More support
- $real_plan = eval {
+ $real_plan = eval {
- require Test::More;
+ require Test::More;
no warnings qw(numeric);
Test::Builder->VERSION('0.18_01');
@@ -152,7 +152,7 @@
$builder->output(\*STDOUT);
$builder->todo_output(\*STDOUT);
- # this is STDOUT because Test::More seems to put
+ # this is STDOUT because Test::More seems to put
# most of the stuff we want on STDERR, so it ends
# up in the error_log instead of where the user can
# see it. consider leaving it alone based on
@@ -636,7 +636,7 @@
use need():
plan tests => 5,
- need 'LWP',
+ need 'LWP',
{ "not Win32" => sub { $^O eq 'MSWin32'} };
see C<need()> for more info.
@@ -704,7 +704,7 @@
within test logic to adjust expectations based on older or newer
server versions.
-=over
+=over
=item need_http11
@@ -862,7 +862,7 @@
plan tests => 5,
need 'LWP',
- { "perl >= 5.8.0 and w/ithreads is required" =>
+ { "perl >= 5.8.0 and w/ithreads is required" =>
($Config{useperlio} && $] >= 5.008) },
{ "not Win32" => sub { $^O eq 'MSWin32' },
"foo is disabled" => \&is_foo_enabled,
@@ -970,11 +970,11 @@
=head1 Test::More Integration
-There are a few caveats if you want to use I<Apache::Test> with
+There are a few caveats if you want to use I<Apache::Test> with
I<Test::More> instead of the default I<Test> backend. The first is
that I<Test::More> requires you to use its own C<plan()> function
and not the one that ships with I<Apache::Test>. I<Test::More> also
-defines C<ok()> and C<skip()> functions that are different, and
+defines C<ok()> and C<skip()> functions that are different, and
simply C<use>ing both modules in your test script will lead to redefined
warnings for these subroutines.
@@ -990,7 +990,7 @@
ok ('yes', 'testing ok'); # Test::More::ok()
-Now, while this works fine for standard client-side tests
+Now, while this works fine for standard client-side tests
(such as C<t/basic.t>), the more advanced features of I<Apache::Test>
require using I<Test::More> as the sole driver behind the scenes.
@@ -1014,7 +1014,7 @@
instead of I<Test.pm> behind the scenes. Note that you are not
required to C<use Test::More> yourself with the C<-withtestmore>
option and that the C<use Test::More tests =E<gt> 1> syntax
-may have unexpected results.
+may have unexpected results.
Note that I<Test::More> version 0.49, available within the
I<Test::Simple> 0.49 distribution on CPAN, or greater is required
Modified: perl/Apache-Test/trunk/lib/Apache/TestClient.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestClient.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestClient.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestClient.pm Mon Dec 31 00:00:09 2007
@@ -136,7 +136,7 @@
close $s;
# an empty body is a valid response
- $res->{content} = ''
+ $res->{content} = ''
unless exists $res->{content} and defined $res->{content};
$res->{headers_as_string} =~ s/\015//g; #for as_string
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Mon Dec 31 00:00:09 2007
@@ -761,7 +761,7 @@
sub select_first_port {
my $self = shift;
- my $port ||= $port_memoized || $ENV{APACHE_TEST_PORT}
+ my $port ||= $port_memoized || $ENV{APACHE_TEST_PORT}
|| $self->{vars}{port} || DEFAULT_PORT;
# memoize
@@ -1400,7 +1400,7 @@
finddepth(sub {
return unless /\.in$/;
(my $generated = $File::Find::name) =~ s/\.in$//;
- push @need_update, $generated
+ push @need_update, $generated
unless -e $generated && -M $generated < -M $File::Find::name;
}, $self->{vars}->{t_conf});
@@ -1645,7 +1645,7 @@
# if httpd.conf is older than executable
push @reasons,
"$exe is newer than $vars->{t_conf_file}"
- if -e $exe &&
+ if -e $exe &&
-e $vars->{t_conf_file} &&
-M $exe < -M $vars->{t_conf_file};
@@ -1899,7 +1899,7 @@
$cfg .= qx{$command};
$cfg .= ldd_as_string($httpd);
- }
+ }
else {
$cfg .= "\n\n*** The httpd binary was not found\n";
}
@@ -1934,7 +1934,7 @@
return $cfg;
}
-
+
# make a string suitable for feed to shell calls (wrap in quotes and
# escape quotes)
sub shell_ready {
@@ -2213,7 +2213,7 @@
sub custom_config_add_conf_opts {
my $args = shift;
- return unless $Apache::TestConfigData::vars and
+ return unless $Apache::TestConfigData::vars and
keys %$Apache::TestConfigData::vars;
debug "overlaying custom config data";
@@ -2330,7 +2330,7 @@
}
my $optional = 0;
my $wanted = 'httpd';
- $vars->{$wanted} =
+ $vars->{$wanted} =
_custom_config_prompt_path($wanted, \%choices, $optional);
}
@@ -2369,7 +2369,7 @@
}
my $optional = 1;
my $wanted = 'apxs';
- $vars->{$wanted} =
+ $vars->{$wanted} =
_custom_config_prompt_path($wanted, \%choices, $optional);
}
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm Mon Dec 31 00:00:09 2007
@@ -385,9 +385,9 @@
module MODULE_VAR_EXPORT name ## _module =
{
STANDARD_MODULE_STUFF,
- NULL, /* initializer */
+ NULL, /* initializer */
$cmodule_config_hooks,
- name ## _handlers, /* handlers */
+ name ## _handlers, /* handlers */
$cmodule_hooks_1
}
EOF
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm Mon Dec 31 00:00:09 2007
@@ -509,7 +509,7 @@
global $_num_failures;
global $_num_skips;
- $_test_num++;
+ $_test_num++;
if ($_num_skips)
{
@@ -715,7 +715,7 @@
{
$pass = ((require $module) == 'OK');
return ok($pass);
-}
+}
function skip($message, $num)
{
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm Mon Dec 31 00:00:09 2007
@@ -81,7 +81,7 @@
my $lib = "$Config{installbin}\\$Config{libperl}";
$lib =~ s/lib$/dll/;
$cfg = 'LoadFile ' . qq("$lib"\n) if -e $lib;
- }
+ }
# add the module we found to the cached modules list
# otherwise have_module('mod_perl') doesn't work unless
# we have a LoadModule in our base config
@@ -148,7 +148,7 @@
# propogate PerlPassEnv settings to the server
sub configure_env {
my $self = shift;
- $self->preamble(IfModule => 'mod_perl.c',
+ $self->preamble(IfModule => 'mod_perl.c',
[ qw(PerlPassEnv APACHE_TEST_TRACE_LEVEL
PerlPassEnv HARNESS_PERL_SWITCHES)
]);
Modified: perl/Apache-Test/trunk/lib/Apache/TestHarness.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestHarness.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestHarness.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestHarness.pm Mon Dec 31 00:00:09 2007
@@ -86,7 +86,7 @@
}
}
}
-
+
my $cmd = qq[$^X $source_lib $file];
my $h = Symbol::gensym();
@@ -140,15 +140,15 @@
my $ts = $args->{tests} || [];
if (@$ts) {
- for (@$ts) {
- if (-d $_) {
- push(@tests, sort <$base/$_/*.t>);
- }
- else {
- $_ .= ".t" unless /\.t$/;
- push(@tests, $_);
- }
- }
+ for (@$ts) {
+ if (-d $_) {
+ push(@tests, sort <$base/$_/*.t>);
+ }
+ else {
+ $_ .= ".t" unless /\.t$/;
+ push(@tests, $_);
+ }
+ }
}
else {
if ($args->{tdirs}) {
Modified: perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm Mon Dec 31 00:00:09 2007
@@ -59,16 +59,16 @@
my $ts = $args->{tests} || [];
if (@$ts) {
- for (@$ts) {
- if (-d $_) {
- push(@tests, sort <$base/$_/*.t>);
- push(@tests, sort <$base/$_/*.php>);
- }
- else {
- $_ .= ".t" unless /(\.t|\.php)$/;
- push(@tests, $_);
- }
- }
+ for (@$ts) {
+ if (-d $_) {
+ push(@tests, sort <$base/$_/*.t>);
+ push(@tests, sort <$base/$_/*.php>);
+ }
+ else {
+ $_ .= ".t" unless /(\.t|\.php)$/;
+ push(@tests, $_);
+ }
+ }
}
else {
if ($args->{tdirs}) {
Modified: perl/Apache-Test/trunk/lib/Apache/TestMB.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestMB.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestMB.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestMB.pm Mon Dec 31 00:00:09 2007
@@ -4,7 +4,7 @@
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
Modified: perl/Apache-Test/trunk/lib/Apache/TestRequest.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRequest.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRequest.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRequest.pm Mon Dec 31 00:00:09 2007
@@ -18,7 +18,7 @@
use strict;
use warnings FATAL => 'all';
-BEGIN {
+BEGIN {
$ENV{PERL_LWP_USE_HTTP_10} = 1; # default to http/1.0
$ENV{APACHE_TEST_HTTP_09_OK} ||= 0; # 0.9 responses are ok
}
@@ -688,7 +688,7 @@
return $res->content if $res->is_success;
- die join "\n",
+ die join "\n",
"request has failed (the response code was: " . $res->code . ")",
"see t/logs/error_log for more details\n";
}
Modified: perl/Apache-Test/trunk/lib/Apache/TestRun.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRun.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRun.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRun.pm Mon Dec 31 00:00:09 2007
@@ -49,7 +49,7 @@
my %original_t_perms = ();
my @std_run = qw(start-httpd run-tests stop-httpd);
-my @others = qw(verbose configure clean help ssl http11 bugreport
+my @others = qw(verbose configure clean help ssl http11 bugreport
save no-httpd one-process);
my @flag_opts = (@std_run, @others);
my @string_opts = qw(order trace);
@@ -212,7 +212,7 @@
# a workaround to support -verbose and -verbose=0|1
# $Getopt::Long::VERSION > 2.26 can use the "verbose:1" rule
# but we have to support older versions as well
- @ARGV = grep defined,
+ @ARGV = grep defined,
map {/-verbose=(\d)/ ? ($1 ? '-verbose' : undef) : $_ } @ARGV;
# permute : optional values can come before the options
@@ -868,7 +868,7 @@
$core_files{$file} = -M $file;
push @cores, $file;
}
- return @cores
+ return @cores
? join "\n", "server dumped core, for stacktrace, run:",
map { "gdb $vars->{httpd} -core $_" } @cores
: ();
@@ -980,7 +980,7 @@
my($uid, $gid) = (getpwnam($user))[2..3]
or die "Can't find out uid/gid of '$user'";
- warning "root mode: ".
+ warning "root mode: ".
"changing the files ownership to '$user' ($uid:$gid)";
finddepth(sub {
$original_t_perms{$File::Find::name} = [(stat $_)[4..5]];
@@ -1372,13 +1372,13 @@
directly. Here is an example of a custom C<t/TEST>
My::TestRun->new->run(@ARGV);
-
+
package My::TestRun;
use base 'Apache::TestRun';
sub bug_report {
my $self = shift;
-
+
print <<EOI;
+--------------------------------------------------------+
| Please file a bug report: http://perl.apache.org/bugs/ |
@@ -1402,12 +1402,12 @@
use base 'Apache::TestRun';
use Apache::TestConfig;
__PACKAGE__->new->run(@ARGV);
-
+
sub pre_configure {
my $self = shift;
# Don't load an installed mod_apreq
Apache::TestConfig::autoconfig_skip_module_add('mod_apreq.c');
-
+
$self->SUPER::pre_configure();
}
Modified: perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm Mon Dec 31 00:00:09 2007
@@ -199,7 +199,7 @@
and C</my/local/apache/bin/httpd> will be propagated throughout the
rest of the process. note that PHP needs to be active within Apache
-prior to configuring the test framework as shown above, either by
+prior to configuring the test framework as shown above, either by
virtue of PHP being compiled into the C<httpd> binary statically or
through an active C<LoadModule> statement within the configuration
located in C</my/local/apache/conf/httpd.conf>. Other required modules
@@ -268,7 +268,7 @@
the include library C<test-more.php> is automatically generated by
C<Apache::TestConfigPHP> and configurations tweaked in such a
-a way that your PHP scripts can find it without issue. the
+a way that your PHP scripts can find it without issue. the
functions provided by C<test-more.php> are equivalent in name and
function to those in C<Test::More>, a standard Perl testing
library, so you can see that manpage for details on the syntax
@@ -276,10 +276,10 @@
at this point, we have enough in place to run some tests from
PHP-land - a C<Makefile.PL> to configure Apache for us, and
-a PHP script in C<t/response/TestFoo/bar.php> to send some
+a PHP script in C<t/response/TestFoo/bar.php> to send some
results out to the testing engine. issuing C<make test>
would start Apache, issue the request to C<bar.php>, generate
-a report, and shut down Apache. the report would look like
+a report, and shut down Apache. the report would look like
something like this after running the tests in verbose mode
(eg C<make test TEST_VERBOSE=1>):
Modified: perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm Mon Dec 31 00:00:09 2007
@@ -54,7 +54,7 @@
# in 0.9.7 s/Email/emailAddress/ in DN
my $email_field = Apache::Test::normalize_vstring($version) <
- Apache::Test::normalize_vstring("0.9.7") ?
+ Apache::Test::normalize_vstring("0.9.7") ?
"Email" : "emailAddress";
my $ca_dn = {
@@ -214,7 +214,7 @@
challengePassword = $pass
[ ca ]
-default_ca = CA_default
+default_ca = CA_default
[ CA_default ]
certs = certs # Where the issued certs are kept
@@ -233,13 +233,13 @@
preserve = no # keep passed DN ordering
[ policy_anything ]
-countryName = optional
-stateOrProvinceName = optional
-localityName = optional
-organizationName = optional
-organizationalUnitName = optional
-commonName = supplied
-emailAddress = optional
+countryName = optional
+stateOrProvinceName = optional
+localityName = optional
+organizationName = optional
+organizationalUnitName = optional
+commonName = supplied
+emailAddress = optional
[ comment ]
nsComment = This Is A Comment
Modified: perl/Apache-Test/trunk/lib/Apache/TestServer.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestServer.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestServer.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestServer.pm Mon Dec 31 00:00:09 2007
@@ -306,9 +306,9 @@
# debug httpd startup code. 6.5 has been proven
# to work. FreeBSD typically installs this as
# gdb65.
- # Is it worth it to check the debugger and os version
+ # Is it worth it to check the debugger and os version
# and die ?
-
+
unless (grep { /^$opts->{debugger}/ } keys %debuggers) {
error "$opts->{debugger} is not a supported debugger",
"These are the supported debuggers: ".
@@ -316,7 +316,7 @@
die("\n");
}
- my $debugger = $opts->{debugger};
+ my $debugger = $opts->{debugger};
$debugger =~ s/\d+$//;
my $method = "start_" . $debuggers{$debugger};
Modified: perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm Mon Dec 31 00:00:09 2007
@@ -282,7 +282,7 @@
# this is a special mode, which really just runs 't/TEST -start;
# t/TEST -run; t/TEST -stop;' but it runs '-run' separately for each
-# test, and checks whether anything bad has happened after the run
+# test, and checks whether anything bad has happened after the run
# of each test (i.e. either a test has failed, or a test may be successful,
# but server may have dumped a core file, we detect that).
sub run_bug_mode {
@@ -316,7 +316,7 @@
($self->{times} > 1 ? "s" : "");
# first time run all tests, or all specified tests
- my @tests = @{ $self->{tests} }; # copy
+ my @tests = @{ $self->{tests} }; # copy
my $bad = $self->run_test($iter, $reduce_iter, \@tests, \@good);
unless ($bad) {
$self->{total_iterations}++;
@@ -420,7 +420,7 @@
my $c = 0;
return sub {
- $c++; # remember stream's state
+ $c++; # remember stream's state
# a single item is not reduce-able
return \@items if $items == 1;
@@ -659,7 +659,7 @@
my $unique_seqs = scalar keys %{ $self->{results} };
my $attempts = $self->{total_reduction_attempts};
my $successes = $self->{total_reduction_successes};
- my $completion = $self->{smoking_completed}
+ my $completion = $self->{smoking_completed}
? "Completed"
: "Not Completed (aborted by user)";
@@ -931,16 +931,16 @@
I<t/SMOKE.PL> is driving this module, if you don't have it, create it:
#!perl
-
+
use strict;
use warnings FATAL => 'all';
-
+
use FindBin;
use lib "$FindBin::Bin/../Apache-Test/lib";
use lib "$FindBin::Bin/../lib";
-
+
use Apache::TestSmoke ();
-
+
Apache::TestSmoke->new(@ARGV)->run;
usually I<Makefile.PL> converts it into I<t/SMOKE> while adjusting the
Modified: perl/Apache-Test/trunk/lib/Apache/TestTrace.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestTrace.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestTrace.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestTrace.pm Mon Dec 31 00:00:09 2007
@@ -96,7 +96,7 @@
sub c_trace {
my ($level, $prefix_type) = (shift, shift);
my $prefix = prefix($prefix_type);
- print $LogFH
+ print $LogFH
map { "$colors{$level}$prefix$_$colors{reset}\n"}
grep defined($_), expand(@_);
}
@@ -104,8 +104,8 @@
sub nc_trace {
my ($level, $prefix_type) = (shift, shift);
my $prefix = prefix($prefix_type);
- print $LogFH
- map { sprintf "[%7s] %s%s\n", $level, $prefix, $_ }
+ print $LogFH
+ map { sprintf "[%7s] %s%s\n", $level, $prefix, $_ }
grep defined($_), expand(@_);
}
@@ -126,10 +126,10 @@
}
sub trace_level {
- # overriden by user/-trace
+ # overriden by user/-trace
(defined $Level && $levels{$Level}) ||
# or overriden by env var
- (exists $ENV{APACHE_TEST_TRACE_LEVEL} &&
+ (exists $ENV{APACHE_TEST_TRACE_LEVEL} &&
$levels{$ENV{APACHE_TEST_TRACE_LEVEL}}) ||
# or default
$levels{$default_level};
@@ -145,39 +145,39 @@
=head1 SYNOPSIS
use Apache::TestTrace;
-
+
debug "foo bar";
-
+
info_sub "missed it";
-
+
error_mark "something is wrong";
# test sub that exercises all the tracing functions
sub test {
- print $Apache::TestTrace::LogFH
+ print $Apache::TestTrace::LogFH
"TraceLevel: $Apache::TestTrace::Level\n";
$_->($_,[1..3],$_) for qw(emerg alert crit error
warning notice info debug todo);
print $Apache::TestTrace::LogFH "\n\n"
};
-
+
# demo the trace subs using default setting
test();
-
+
{
# override the default trace level with 'crit'
local $Apache::TestTrace::Level = 'crit';
# now only 'crit' and higher levels will do tracing lower level
test();
}
-
+
{
# set the trace level to 'debug'
local $Apache::TestTrace::Level = 'debug';
# now only 'debug' and higher levels will do tracing lower level
test();
}
-
+
{
open OUT, ">/tmp/foo" or die $!;
# override the default Log filehandle
@@ -186,10 +186,10 @@
test();
close OUT;
}
-
+
# override tracing level via -trace opt
% t/TEST -trace=debug
-
+
# override tracing level via env var
% env APACHE_TEST_TRACE_LEVEL=debug t/TEST
Modified: perl/Apache-Test/trunk/lib/Apache/TestUtil.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestUtil.pm?rev=607695&r1=607694&r2=607695&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestUtil.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestUtil.pm Mon Dec 31 00:00:09 2007
@@ -43,7 +43,7 @@
);
@EXPORT_OK = qw(t_write_perl_script t_write_shell_script t_chown
- t_catfile_apache t_catfile
+ t_catfile_apache t_catfile
t_start_error_log_watch t_finish_error_log_watch);
%CLEAN = ();
@@ -132,7 +132,7 @@
sub t_cmp ($$;$) {
- Carp::carp(join(":", (caller)[1..2]) .
+ Carp::carp(join(":", (caller)[1..2]) .
' usage: $res = t_cmp($received, $expected, [$comment])')
if @_ < 2 || @_ > 3;
@@ -364,7 +364,7 @@
}
}
-my $banner_format =
+my $banner_format =
"\n*** The following %s expected and harmless ***\n";
sub is_expected_banner {
@@ -767,9 +767,9 @@
use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET);
-
+
plan tests => 1;
-
+
t_client_log_error_is_expected();
my $url = "/error_document/cannot_be_found";
my $res = GET($url);
@@ -779,7 +779,7 @@
similar to the following snippet:
*** The following error entry is expected and harmless ***
- [Tue Apr 01 14:02:55 2003] [error] [client 127.0.0.1]
+ [Tue Apr 01 14:02:55 2003] [error] [client 127.0.0.1]
File does not exist: /tmp/test/t/htdocs/error
When more than one entry is expected, an optional numerical argument,
Author: phred
Date: Mon Nov 26 11:34:42 2007
New Revision: 598393
URL: http://svn.apache.org/viewvc?rev=598393&view=rev
Log:
start 1.31-dev cycle
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/RELEASE
perl/Apache-Test/trunk/lib/Apache/Test.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=598393&r1=598392&r2=598393&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Mon Nov 26 11:34:42 2007
@@ -6,6 +6,9 @@
=over 3
+=item 1.31-dev
+
+
=item 1.30 November 26, 2007
Added t_write_test_lib for temporary testing packages
Modified: perl/Apache-Test/trunk/RELEASE
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/RELEASE?rev=598393&r1=598392&r2=598393&view=diff
==============================================================================
--- perl/Apache-Test/trunk/RELEASE (original)
+++ perl/Apache-Test/trunk/RELEASE Mon Nov 26 11:34:42 2007
@@ -30,7 +30,7 @@
(or maybe longer to give most people a chance to catch up). no need
to tag this package
- Subject: [RELEASE CANDIDATE] Apache-Test-1.30 RC\d+
+ Subject: [RELEASE CANDIDATE] Apache-Test-1.31 RC\d+
a. if problems are detected during stage 2, repeat stages 1 and 2.
@@ -62,7 +62,7 @@
5. Announce the package
a. post ... to the modperl, announce lists
- Subject: [ANNOUNCE] Apache-Test 1.30
+ Subject: [ANNOUNCE] Apache-Test 1.31
include
- MD5 sig (as it comes from CPAN upload announce).
- the latest Changes
@@ -74,7 +74,7 @@
b. edit ./Changes:
- start a new item with incremented version + '-dev'
- =item 1.31-dev
+ =item 1.32-dev
c. bump up version numbers in this file to make it easier to do the
next release.
@@ -82,4 +82,4 @@
$ perl -pi -e 's/(\d+)\.(\d+)/join(".", $1, $2+1)/eg' RELEASE
d. commit Changes
- % svn ci -m "start 1.31-dev cycle" Changes RELEASE lib/Apache/Test.pm
+ % svn ci -m "start 1.32-dev cycle" Changes RELEASE lib/Apache/Test.pm
Modified: perl/Apache-Test/trunk/lib/Apache/Test.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/Test.pm?rev=598393&r1=598392&r2=598393&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/Test.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/Test.pm Mon Nov 26 11:34:42 2007
@@ -36,7 +36,7 @@
use vars qw(@ISA @EXPORT %EXPORT_TAGS $VERSION %SubTests @SkipReasons);
-$VERSION = '1.30';
+$VERSION = '1.31';
my @need = qw(need_lwp need_http11 need_cgi need_access need_auth
need_module need_apache need_min_apache_version
Author: phred
Date: Mon Nov 26 11:10:28 2007
New Revision: 598388
URL: http://svn.apache.org/viewvc?rev=598388&view=rev
Log:
Tagging 1.30 branch
Added:
perl/Apache-Test/tags/1_30/
- copied from r598387, perl/Apache-Test/trunk/
Author: phred
Date: Mon Nov 26 11:09:41 2007
New Revision: 598387
URL: http://svn.apache.org/viewvc?rev=598387&view=rev
Log:
Ship v1.30
Modified:
perl/Apache-Test/trunk/Changes
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=598387&r1=598386&r2=598387&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Mon Nov 26 11:09:41 2007
@@ -6,7 +6,7 @@
=over 3
-=item 1.30-dev
+=item 1.30 November 26, 2007
Added t_write_test_lib for temporary testing packages
[Fred Moyer <fred@redhotpenguin.com>]
Author: phred
Date: Fri Nov 16 08:23:46 2007
New Revision: 595725
URL: http://svn.apache.org/viewvc?rev=595725&view=rev
Log:
mod_alias is needed to run this test.
Modified:
perl/Apache-Test/trunk/t/cookies.t
Modified: perl/Apache-Test/trunk/t/cookies.t
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/t/cookies.t?rev=595725&r1=595724&r2=595725&view=diff
==============================================================================
--- perl/Apache-Test/trunk/t/cookies.t (original)
+++ perl/Apache-Test/trunk/t/cookies.t Fri Nov 16 08:23:46 2007
@@ -8,7 +8,7 @@
use Apache::TestUtil;
plan tests => 2, need [qw(CGI CGI::Cookie)],
- need_cgi, need_lwp;
+ need_cgi, need_lwp, need need_module('mod_alias.c');
Apache::TestRequest::user_agent( cookie_jar => {} );
Author: phred
Date: Thu Nov 15 15:45:44 2007
New Revision: 595491
URL: http://svn.apache.org/viewvc?rev=595491&view=rev
Log:
Add t_write_test_lib method to be used for volatile test packages.
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm
perl/Apache-Test/trunk/lib/Apache/TestUtil.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=595491&r1=595490&r2=595491&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Thu Nov 15 15:45:44 2007
@@ -8,6 +8,9 @@
=item 1.30-dev
+Added t_write_test_lib for temporary testing packages
+[Fred Moyer <fred@redhotpenguin.com>]
+
Fix syntax error in generated PHP files t/conf/*.php.in
[Philippe M. Chiasson]
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm?rev=595491&r1=595490&r2=595491&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm Thu Nov 15 15:45:44 2007
@@ -206,6 +206,17 @@
print $fh "use lib '$tlib';\n";
}
+ # directory for temp packages which can change during testing
+ # we use require here since a circular dependency exists
+ # between Apache::TestUtil and Apache::TestConfigPerl, so
+ # use does not work here
+ eval { require Apache::TestUtil; };
+ if ($@) {
+ die "could not require Apache::TestUtil: $@";
+ } else {
+ print $fh "use lib '" . Apache::TestUtil::_temp_package_dir() . "';\n";
+ }
+
# if Apache::Test is used to develop a project, we want the
# project/lib directory to be first in @INC (loaded last)
if ($ENV{APACHE_TEST_LIVE_DEV}) {
Modified: perl/Apache-Test/trunk/lib/Apache/TestUtil.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestUtil.pm?rev=595491&r1=595490&r2=595491&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestUtil.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestUtil.pm Thu Nov 15 15:45:44 2007
@@ -24,7 +24,7 @@
use Carp ();
use Config;
use File::Basename qw(dirname);
-use File::Spec::Functions qw(catfile file_name_is_absolute);
+use File::Spec::Functions qw(catfile catdir file_name_is_absolute tmpdir);
use Symbol ();
use Fcntl qw(SEEK_END);
@@ -37,7 +37,7 @@
@ISA = qw(Exporter);
@EXPORT = qw(t_cmp t_debug t_append_file t_write_file t_open_file
- t_mkdir t_rmtree t_is_equal t_filepath_cmp
+ t_mkdir t_rmtree t_is_equal t_filepath_cmp t_write_test_lib
t_server_log_error_is_expected t_server_log_warn_is_expected
t_client_log_error_is_expected t_client_log_warn_is_expected
);
@@ -191,6 +191,18 @@
return $fh;
}
+sub _temp_package_dir {
+ return catdir(tmpdir(), 'apache_test');
+}
+
+sub t_write_test_lib {
+ my $file = shift;
+
+ die "must pass a filename" unless defined $file;
+
+ t_write_file(catdir(_temp_package_dir(), $file), @_);
+}
+
sub t_write_file {
my $file = shift;
@@ -546,6 +558,17 @@
circumstances unless running under verbose mode.
This function is exported by default.
+
+=item t_write_test_lib()
+
+ t_write_test_lib($filename, @lines)
+
+t_write_test_lib() creates a new file at I<$filename> or overwrites
+the existing file with the content passed in I<@lines>. The file
+is created in a temporary directory which is added to @INC at
+test configuration time. It is intended to be used for creating
+temporary packages for testing which can be modified at run time,
+see the Apache::Reload unit tests for an example.
=item t_write_file()
gozer@apache.org wrote: > Author: gozer > Date: Wed Oct 31 00:15:30 2007 > New Revision: 590575 > > URL: http://svn.apache.org/viewvc?rev=590575&view=rev > Log: > Teach Apache::TestConfig to generate valid PHP comments > <?php /* */i ?> when generating PHP files from t/conf/*.php.in Sorry, there was a typo in the commit message, a php comment will look like: <?php /* */ ?> I fixed the log message, btw. $> svn propedit -r 590575 --revprop svn:log Set new value for property 'svn:log' on revision 590575 ------------------------------------------------------------------------ Philippe M. Chiasson GPG: F9BFE0C2480E7680 1AE53631CB32A107 88C3A5A5 http://gozer.ectoplasm.org/ m/gozer\@(apache|cpan|ectoplasm)\.org/
Author: gozer Revision: 590575 Modified property: svn:log Modified: svn:log at Wed Oct 31 00:20:56 2007 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Wed Oct 31 00:20:56 2007 @@ -1,3 +1,3 @@ Teach Apache::TestConfig to generate valid PHP comments -<?php /* */i ?> when generating PHP files from t/conf/*.php.in +<?php /* */ ?> when generating PHP files from t/conf/*.php.in
Author: gozer
Date: Wed Oct 31 00:15:30 2007
New Revision: 590575
URL: http://svn.apache.org/viewvc?rev=590575&view=rev
Log:
Teach Apache::TestConfig to generate valid PHP comments
<?php /* */i ?> when generating PHP files from t/conf/*.php.in
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=590575&r1=590574&r2=590575&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Wed Oct 31 00:15:30 2007
@@ -8,6 +8,9 @@
=item 1.30-dev
+Fix syntax error in generated PHP files t/conf/*.php.in
+[Philippe M. Chiasson]
+
Add bwshare.so to the list of modules to not inherit b/c
it rate limits requests to less then that of a test suite.
PR: 25548
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?rev=590575&r1=590574&r2=590575&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Wed Oct 31 00:15:30 2007
@@ -870,12 +870,14 @@
my %warn_style = (
html => sub { "<!-- @_ -->" },
c => sub { "/* @_ */" },
+ php => sub { "<?php /* \n@_ \n*/ ?>" },
default => sub { join '', grep {s/^/\# /gm} @_ },
);
my %file_ext = (
map({$_ => 'html'} qw(htm html)),
map({$_ => 'c' } qw(c h)),
+ map({$_ => 'php' } qw(php)),
);
# return the passed file's extension or '' if there is no one
Author: geoff
Date: Fri Oct 5 12:02:59 2007
New Revision: 582373
URL: http://svn.apache.org/viewvc?rev=582373&view=rev
Log:
add generation warning to generated Makefiles
Modified:
perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm?rev=582373&r1=582372&r2=582373&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm Fri Oct 5 12:02:59 2007
@@ -126,8 +126,7 @@
}
my $file = catfile $self->{cmodules_dir}, 'Makefile';
- my $fh = Symbol::gensym();
- open $fh, ">$file" or die "open $file: $!";
+ my $fh = $self->genfile($file);
print $fh $self->cmodules_makefile_vars;
@@ -176,8 +175,7 @@
my $lib = $self->cmodules_build_so($name);
- my $fh = Symbol::gensym();
- open $fh, ">$makefile" or die "open $makefile: $!";
+ my $fh = $self->genfile($makefile);
print $fh <<EOF;
APXS=$self->{APXS}
Author: geoff
Date: Fri Jun 29 08:20:38 2007
New Revision: 551925
URL: http://svn.apache.org/viewvc?view=rev&rev=551925
Log:
Add EXTRA_CFLAGS to c-module building if defined in the environment
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?view=diff&rev=551925&r1=551924&r2=551925
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Fri Jun 29 08:20:38 2007
@@ -13,6 +13,9 @@
PR: 25548
[imacat <imacat@mail.imacat.idv.tw>]
+Add EXTRA_CFLAGS to c-module building if defined in the environment
+[Geoffrey Young]
+
=item 1.29 November 28, 2006
Require a minium of Module::Build 0.18 when using Apache::TestMB.
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm?view=diff&rev=551925&r1=551924&r2=551925
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm Fri Jun 29 08:20:38 2007
@@ -169,6 +169,9 @@
my $dversion = $self->server->dversion;
my $name = $mod->{name};
my $makefile = catfile $mod->{dir}, 'Makefile';
+
+ my $extra = $ENV{EXTRA_CFLAGS} || '';
+
debug "writing $makefile";
my $lib = $self->cmodules_build_so($name);
@@ -181,7 +184,7 @@
all: $lib
$lib: $name.c
- \$(APXS) $dversion -I$self->{cmodules_dir} -c $name.c
+ \$(APXS) $dversion $extra -I$self->{cmodules_dir} -c $name.c
clean:
-rm -rf $name.o $name.lo $name.slo $name.la .libs
@@ -213,6 +216,9 @@
close $fh;
}
}
+
+ my $extra = $ENV{EXTRA_CFLAGS} || '';
+
debug "writing $makefile";
my $lib = $self->cmodules_build_so($name);
@@ -226,7 +232,7 @@
all: $lib
$lib: $name.c
- \$(APXS) $dversion -I$self->{cmodules_dir} \$(APXSFLAGS) -c $name.c
+ \$(APXS) $dversion $extra -I$self->{cmodules_dir} \$(APXSFLAGS) -c $name.c
clean:
-rm -rf $name.o $name.lo $name.slo $name.la .libs
@@ -251,12 +257,16 @@
my $fh = Symbol::gensym();
open $fh, ">$makefile" or die "open $makefile: $!";
+ my $extra = $ENV{EXTRA_CFLAGS} || '';
+
+ debug "writing $makefile";
+
print $fh <<EOF;
APXS=$self->{APXS}
all: $lib
$lib: $name.c
- \$(APXS) $dversion -I$self->{cmodules_dir} $extras -c $name.c
+ \$(APXS) $dversion $extra -I$self->{cmodules_dir} $extras -c $name.c
clean:
-erase $goners
Author: gozer
Date: Wed Apr 25 19:13:08 2007
New Revision: 532570
URL: http://svn.apache.org/viewvc?view=rev&rev=532570
Log:
Fix misdocumented -apxs flag in Apache::TestMB
Submitted by: Joshua Hoblitt <jhoblitt@ifa.hawaii.edu>
Message ID: <20070425211853.GC6531@ifa.hawaii.edu>
Modified:
perl/Apache-Test/trunk/lib/Apache/TestMB.pm
Modified: perl/Apache-Test/trunk/lib/Apache/TestMB.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestMB.pm?view=diff&rev=532570&r1=532569&r2=532570
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestMB.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestMB.pm Wed Apr 25 19:13:08 2007
@@ -258,7 +258,7 @@
options in addition to the usual C<Module::Build> options. For
example:
- perl Build.PL -apxs=/usr/local/apache/bin/apxs
+ perl Build.PL -apxs /usr/local/apache/bin/apxs
Consult the L<Apache::Test|Apache::Test> documentation for a complete
list of options.
Author: pgollucci
Date: Mon Mar 19 19:04:34 2007
New Revision: 520217
URL: http://svn.apache.org/viewvc?view=rev&rev=520217
Log:
moved note to the correct version -- its been a while
Modified:
perl/Apache-Test/trunk/Changes
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?view=diff&rev=520217&r1=520216&r2=520217
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Mon Mar 19 19:04:34 2007
@@ -8,13 +8,12 @@
=item 1.30-dev
-
-=item 1.29 November 28, 2006
-
Add bwshare.so to the list of modules to not inherit b/c
it rate limits requests to less then that of a test suite.
PR: 25548
[imacat <imacat@mail.imacat.idv.tw>]
+
+=item 1.29 November 28, 2006
Require a minium of Module::Build 0.18 when using Apache::TestMB.
PR: 19513
Author: pgollucci
Date: Mon Mar 19 19:03:34 2007
New Revision: 520216
URL: http://svn.apache.org/viewvc?view=rev&rev=520216
Log:
http://rt.cpan.org/Ticket/Display.html?id=25548
Add bwshare.so to modules to not inherit so rate limiting
doesn't cause test failures.
Submitted by: imacat <imacat@mail.imacat.idv.tw>
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?view=diff&rev=520216&r1=520215&r2=520216
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Mon Mar 19 19:03:34 2007
@@ -11,6 +11,11 @@
=item 1.29 November 28, 2006
+Add bwshare.so to the list of modules to not inherit b/c
+it rate limits requests to less then that of a test suite.
+PR: 25548
+[imacat <imacat@mail.imacat.idv.tw>]
+
Require a minium of Module::Build 0.18 when using Apache::TestMB.
PR: 19513
[Philip M. Gollucci]
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm?view=diff&rev=520216&r1=520215&r2=520216
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm Mon Mar 19 19:03:34 2007
@@ -179,7 +179,8 @@
#XXX mod_jk requires JkWorkerFile or JkWorker to be configured
#skip it for now, tomcat has its own test suite anyhow.
#XXX: mod_casp2.so requires other settings in addition to LoadModule
-my @autoconfig_skip_module = qw(mod_jk.c mod_casp2.c);
+#XXX: mod_bwshare.so blocks fast requests that tests are doing
+my @autoconfig_skip_module = qw(mod_jk.c mod_casp2.c mod_bwshare.c);
# add modules to be not inherited from the existing config.
# e.g. prevent from LoadModule perl_module to be included twice, when
Author: pgollucci
Date: Tue Nov 28 23:20:27 2006
New Revision: 480441
URL: http://svn.apache.org/viewvc?view=rev&rev=480441
Log:
start 1.30-dev cycle
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/RELEASE
perl/Apache-Test/trunk/lib/Apache/Test.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?view=diff&rev=480441&r1=480440&r2=480441
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Tue Nov 28 23:20:27 2006
@@ -6,6 +6,9 @@
=over 3
+=item 1.30-dev
+
+
=item 1.29 November 28, 2006
Require a minium of Module::Build 0.18 when using Apache::TestMB.
Modified: perl/Apache-Test/trunk/RELEASE
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/RELEASE?view=diff&rev=480441&r1=480440&r2=480441
==============================================================================
--- perl/Apache-Test/trunk/RELEASE (original)
+++ perl/Apache-Test/trunk/RELEASE Tue Nov 28 23:20:27 2006
@@ -30,7 +30,7 @@
(or maybe longer to give most people a chance to catch up). no need
to tag this package
- Subject: [RELEASE CANDIDATE] Apache-Test-1.29 RC\d+
+ Subject: [RELEASE CANDIDATE] Apache-Test-1.30 RC\d+
a. if problems are detected during stage 2, repeat stages 1 and 2.
@@ -62,7 +62,7 @@
5. Announce the package
a. post ... to the modperl, announce lists
- Subject: [ANNOUNCE] Apache-Test 1.29
+ Subject: [ANNOUNCE] Apache-Test 1.30
include
- MD5 sig (as it comes from CPAN upload announce).
- the latest Changes
@@ -74,7 +74,7 @@
b. edit ./Changes:
- start a new item with incremented version + '-dev'
- =item 1.30-dev
+ =item 1.31-dev
c. bump up version numbers in this file to make it easier to do the
next release.
@@ -82,4 +82,4 @@
$ perl -pi -e 's/(\d+)\.(\d+)/join(".", $1, $2+1)/eg' RELEASE
d. commit Changes
- % svn ci -m "start 1.30-dev cycle" Changes RELEASE lib/Apache/Test.pm
+ % svn ci -m "start 1.31-dev cycle" Changes RELEASE lib/Apache/Test.pm
Modified: perl/Apache-Test/trunk/lib/Apache/Test.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/Test.pm?view=diff&rev=480441&r1=480440&r2=480441
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/Test.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/Test.pm Tue Nov 28 23:20:27 2006
@@ -36,7 +36,7 @@
use vars qw(@ISA @EXPORT %EXPORT_TAGS $VERSION %SubTests @SkipReasons);
-$VERSION = '1.29';
+$VERSION = '1.30';
my @need = qw(need_lwp need_http11 need_cgi need_access need_auth
need_module need_apache need_min_apache_version
Author: pgollucci
Date: Tue Nov 28 23:12:46 2006
New Revision: 480439
URL: http://svn.apache.org/viewvc?view=rev&rev=480439
Log:
official 1.29
Added:
perl/Apache-Test/tags/1_29/
- copied from r480438, perl/Apache-Test/trunk/
Author: pgollucci
Date: Tue Nov 28 23:11:57 2006
New Revision: 480438
URL: http://svn.apache.org/viewvc?view=rev&rev=480438
Log:
official 1.29
Modified:
perl/Apache-Test/trunk/Changes
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?view=diff&rev=480438&r1=480437&r2=480438
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Tue Nov 28 23:11:57 2006
@@ -6,7 +6,7 @@
=over 3
-=item 1.29-dev
+=item 1.29 November 28, 2006
Require a minium of Module::Build 0.18 when using Apache::TestMB.
PR: 19513
Author: pgollucci
Date: Sat Nov 11 14:14:17 2006
New Revision: 473808
URL: http://svn.apache.org/viewvc?view=rev&rev=473808
Log:
http://rt.cpan.org/Ticket/Display.html?id=19513
Require a minium of Module::Build 0.18 for Apache::TestMB
Submitted By: TIMA <TIMA@cpan.org>
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestMB.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?view=diff&rev=473808&r1=473807&r2=473808
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Sat Nov 11 14:14:17 2006
@@ -8,6 +8,10 @@
=item 1.29-dev
+Require a minium of Module::Build 0.18 when using Apache::TestMB.
+PR: 19513
+[Philip M. Gollucci]
+
Teach Apache::TestClient to encode spaces(' ') in query string of URLs
as %20. This is not a full mapping of ASCII to URL encoding.
If you need this, install LWP -- then Apache-Test will use
Modified: perl/Apache-Test/trunk/lib/Apache/TestMB.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestMB.pm?view=diff&rev=473808&r1=473807&r2=473808
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestMB.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestMB.pm Sat Nov 11 14:14:17 2006
@@ -18,7 +18,7 @@
use strict;
use vars qw(@ISA);
-use Module::Build;
+use Module::Build 0.18;
use Apache::Test ();
use Apache::TestConfig ();
@ISA = qw(Module::Build);
Author: pgollucci
Date: Thu Nov 9 00:05:30 2006
New Revision: 472804
URL: http://svn.apache.org/viewvc?view=rev&rev=472804
Log:
attempt to prevent using the wrong subject in release candidate announcements.
Modified:
perl/Apache-Test/trunk/RELEASE
Modified: perl/Apache-Test/trunk/RELEASE
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/RELEASE?view=diff&rev=472804&r1=472803&r2=472804
==============================================================================
--- perl/Apache-Test/trunk/RELEASE (original)
+++ perl/Apache-Test/trunk/RELEASE Thu Nov 9 00:05:30 2006
@@ -30,6 +30,8 @@
(or maybe longer to give most people a chance to catch up). no need
to tag this package
+ Subject: [RELEASE CANDIDATE] Apache-Test-1.29 RC\d+
+
a. if problems are detected during stage 2, repeat stages 1 and 2.
3. when the package has been reported to be good, prepare a new
Author: pgollucci
Date: Mon Nov 6 15:10:59 2006
New Revision: 471923
URL: http://svn.apache.org/viewvc?view=rev&rev=471923
Log:
adding license header.
Modified:
perl/Apache-Test/trunk/lib/Apache/TestMB.pm
Modified: perl/Apache-Test/trunk/lib/Apache/TestMB.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestMB.pm?view=diff&rev=471923&r1=471922&r2=471923
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestMB.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestMB.pm Mon Nov 6 15:10:59 2006
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
package Apache::TestMB;
use strict;
Author: pgollucci
Date: Mon Nov 6 14:27:29 2006
New Revision: 471900
URL: http://svn.apache.org/viewvc?view=rev&rev=471900
Log:
update the license headers per board resolution with Nov 1 deadline
Modified:
perl/Apache-Test/trunk/lib/Apache/Test.pm
perl/Apache-Test/trunk/lib/Apache/Test5005compat.pm
perl/Apache-Test/trunk/lib/Apache/TestBuild.pm
perl/Apache-Test/trunk/lib/Apache/TestClient.pm
perl/Apache-Test/trunk/lib/Apache/TestCommon.pm
perl/Apache-Test/trunk/lib/Apache/TestCommonPost.pm
perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigParrot.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm
perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm
perl/Apache-Test/trunk/lib/Apache/TestHandler.pm
perl/Apache-Test/trunk/lib/Apache/TestHarness.pm
perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm
perl/Apache-Test/trunk/lib/Apache/TestMM.pm
perl/Apache-Test/trunk/lib/Apache/TestPerlDB.pm
perl/Apache-Test/trunk/lib/Apache/TestReport.pm
perl/Apache-Test/trunk/lib/Apache/TestReportPerl.pm
perl/Apache-Test/trunk/lib/Apache/TestRequest.pm
perl/Apache-Test/trunk/lib/Apache/TestRun.pm
perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm
perl/Apache-Test/trunk/lib/Apache/TestRunParrot.pm
perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm
perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm
perl/Apache-Test/trunk/lib/Apache/TestServer.pm
perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm
perl/Apache-Test/trunk/lib/Apache/TestSmokePerl.pm
perl/Apache-Test/trunk/lib/Apache/TestSort.pm
perl/Apache-Test/trunk/lib/Apache/TestTrace.pm
perl/Apache-Test/trunk/lib/Apache/TestUtil.pm
perl/Apache-Test/trunk/lib/Bundle/ApacheTest.pm
Modified: perl/Apache-Test/trunk/lib/Apache/Test.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/Test.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/Test.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/Test.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/Test5005compat.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/Test5005compat.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/Test5005compat.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/Test5005compat.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestBuild.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestBuild.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestBuild.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestBuild.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2002-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestClient.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestClient.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestClient.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestClient.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestCommon.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestCommon.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestCommon.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestCommon.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestCommonPost.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestCommonPost.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestCommonPost.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestCommonPost.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2002-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigPHP.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigParrot.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigParrot.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigParrot.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigParrot.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigPerl.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestHandler.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestHandler.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestHandler.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestHandler.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestHarness.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestHarness.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestHarness.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestHarness.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestHarnessPHP.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestMM.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestMM.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestMM.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestMM.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestPerlDB.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestPerlDB.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestPerlDB.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestPerlDB.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestReport.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestReport.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestReport.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestReport.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestReportPerl.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestReportPerl.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestReportPerl.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestReportPerl.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestRequest.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRequest.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRequest.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRequest.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestRun.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRun.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRun.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRun.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRunPHP.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestRunParrot.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRunParrot.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRunParrot.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRunParrot.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestServer.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestServer.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestServer.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestServer.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestSmoke.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestSmokePerl.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestSmokePerl.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestSmokePerl.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestSmokePerl.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestSort.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestSort.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestSort.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestSort.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestTrace.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestTrace.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestTrace.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestTrace.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Apache/TestUtil.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestUtil.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestUtil.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestUtil.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Modified: perl/Apache-Test/trunk/lib/Bundle/ApacheTest.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Bundle/ApacheTest.pm?view=diff&rev=471900&r1=471899&r2=471900
==============================================================================
--- perl/Apache-Test/trunk/lib/Bundle/ApacheTest.pm (original)
+++ perl/Apache-Test/trunk/lib/Bundle/ApacheTest.pm Mon Nov 6 14:27:29 2006
@@ -1,9 +1,9 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
Author: pgollucci
Date: Fri Nov 3 23:08:47 2006
New Revision: 471132
URL: http://svn.apache.org/viewvc?view=rev&rev=471132
Log:
spruce up the need_module() documentation
based on PR 22748
Modified:
perl/Apache-Test/trunk/lib/Apache/Test.pm
Modified: perl/Apache-Test/trunk/lib/Apache/Test.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/Test.pm?view=diff&rev=471132&r1=471131&r2=471132
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/Test.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/Test.pm Fri Nov 3 23:08:47 2006
@@ -647,6 +647,12 @@
skipped if need_module() returns false (which happens when at least
one C or Perl module from the list cannot be found).
+Watch out for case insensitive file systems or duplicate modules
+with the same name. I.E. If you mean mod_env.c
+ need_module('mod_env.c')
+Not
+ need_module('env')
+
=item * a C<CODE> reference
the tests will be skipped if the function returns a false value. For
geoff@apache.org wrote: > Author: geoff > Date: Fri Nov 3 06:00:02 2006 > New Revision: 470824 You beat me to it! -- ------------------------------------------------------------------------ Philip M. Gollucci (pgollucci@p6m7g8.com) 323.219.4708 Consultant / http://p6m7g8.net/Resume/resume.shtml Senior Software Engineer - TicketMaster - http://ticketmaster.com 1024D/A79997FA F357 0FDD 2301 6296 690F 6A47 D55A 7172 A799 97F I never had a dream come true 'Til the day that I found you. Even though I pretend that I've moved on You'll always be my baby. I never found the words to say You're the one I think about each day And I know no matter where life takes me to A part of me will always be... A part of me will always be with you.
Author: geoff
Date: Fri Nov 3 06:00:02 2006
New Revision: 470824
URL: http://svn.apache.org/viewvc?view=rev&rev=470824
Log:
make sure that env doesn't collide with Env.pm
on case-insensitive filesystems
thanks to Michael G Schwern for tracking it down
PR 22748
Modified:
perl/Apache-Test/trunk/t/next_available_port.t
Modified: perl/Apache-Test/trunk/t/next_available_port.t
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/t/next_available_port.t?view=diff&rev=470824&r1=470823&r2=470824
==============================================================================
--- perl/Apache-Test/trunk/t/next_available_port.t (original)
+++ perl/Apache-Test/trunk/t/next_available_port.t Fri Nov 3 06:00:02 2006
@@ -7,7 +7,7 @@
use Apache::TestRequest;
use Apache::TestUtil;
-plan tests => 1, need need_cgi, need_module('env');
+plan tests => 1, need need_cgi, need_module('mod_env.c');
my $url = '/cgi-bin/next_available_port.pl';
Author: pgollucci
Date: Tue Oct 31 11:32:53 2006
New Revision: 469617
URL: http://svn.apache.org/viewvc?view=rev&rev=469617
Log:
Un if ifying for CGYWIN legacy versions that are no longer downloadable.
This is the Apache-Test side of a two part patch.
The oldest version tested: is 1.5.18-1 with Apache 2.0.54
Submitted By: Nikolay Ananiev <ananiev@thegdb.com>
see also: http://svn.apache.org/viewvc?view=rev&rev=469616
for the modperl part
Modified:
perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?view=diff&rev=469617&r1=469616&r2=469617
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Tue Oct 31 11:32:53 2006
@@ -23,7 +23,7 @@
use constant CYGWIN => $^O eq 'cygwin';
use constant NETWARE => $^O eq 'NetWare';
use constant SOLARIS => $^O eq 'solaris';
-use constant WINFU => WIN32 || CYGWIN || NETWARE;
+use constant WINFU => WIN32 || NETWARE;
use constant COLOR => ($ENV{APACHE_TEST_COLOR} && -t STDOUT) ? 1 : 0;
use constant DEFAULT_PORT => 8529;
@@ -1589,7 +1589,7 @@
$self->preamble_run($out);
- for my $name (qw(user group)) { #win32/cygwin do not support
+ for my $name (qw(user group)) { #win32
if ($vars->{$name}) {
print $out qq[\u$name "$vars->{$name}"\n];
}