You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-commits@perl.apache.org by ph...@apache.org on 2009/04/18 12:00:22 UTC
svn commit: r766285 - in /perl/Apache-Test/trunk: Changes
lib/Apache/TestConfig.pm lib/Apache/TestRequest.pm t/next_available_port.t
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 <cp...@rickster.com>]
+
Work around a bug introduced in libwww-perl in version
5.820 for httpd's credentials
[Gunnar Wolf <gw...@gwolf.org>, Niko Tyni <nt...@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';
Fwd: svn commit: r766285 - in /perl/Apache-Test/trunk: Changes
lib/Apache/TestConfig.pm lib/Apache/TestRequest.pm t/next_available_port.t
Posted by Fred Moyer <fr...@redhotpenguin.com>.
Sorry guys, I committed some earlier changes to my 1_30 tag by mistake
(I never updated to trunk again after the 1.30 release). I'll add
some stuff to the RELEASE doc to help bungling coders like myself
avoid this issue.
On the plus side, I closed out two A:T RT tickets last night, there
are 7 open ones remaining. I put messages out to the requestors there
for feedback.
Is there anything blocking a 1.31 release now? Based on previous
conversations, it seems like we would want to cut 1.31, and then
update the bundled mod_perl version to the 1.31 tag. Does that sound
right? I'm volunteering to RM it (promise I won't snafu the version
like last time :)
Here is the changelog for 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 <cp...@rickster.com>]
Work around a bug introduced in libwww-perl in version
5.820 for httpd's credentials
[Gunnar Wolf <gw...@gwolf.org>, Niko Tyni <nt...@debian.org>
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]
Don't overwrite php.ini if it already exists
PR: 32994
---------- Forwarded message ----------
From: <ph...@apache.org>
Date: Sat, Apr 18, 2009 at 3:00 AM
Subject: svn commit: r766285 - in /perl/Apache-Test/trunk: Changes
lib/Apache/TestConfig.pm lib/Apache/TestRequest.pm
t/next_available_port.t
To: test-commits@perl.apache.org
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 <cp...@rickster.com>]
+
Work around a bug introduced in libwww-perl in version
5.820 for httpd's credentials
[Gunnar Wolf <gw...@gwolf.org>, Niko Tyni <nt...@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';
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org