Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@perl.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1029211 - in /perl/modperl/trunk: Changes
 lib/Apache2/Status.pm
 t/conf/extra.conf.in t/hooks/authen_basic.t t/hooks/authz.t
Date: Sat, 30 Oct 2010 21:59:46 -0000
To: modperl-cvs@perl.apache.org
From: phred@apache.org
Message-Id: <20101030215947.10CBA23888FE@eris.apache.org>

Author: phred
Date: Sat Oct 30 21:59:46 2010
New Revision: 1029211

URL: http://svn.apache.org/viewvc?rev=1029211&view=rev
Log:
Apply fixes for various issues with newer LWP and B::Concise
http://www.gossamer-threads.com/lists/modperl/modperl/102217

Submitted by:  Doug Schrag
Applied by:  Fred Moyer
Tested by:  Fred Moyer

Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/lib/Apache2/Status.pm
    perl/modperl/trunk/t/conf/extra.conf.in
    perl/modperl/trunk/t/hooks/authen_basic.t
    perl/modperl/trunk/t/hooks/authz.t

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=1029211&r1=1029210&r2=1029211&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Sat Oct 30 21:59:46 2010
@@ -12,6 +12,12 @@ Also refer to the Apache::Test changes l
 
 =item 2.0.5-dev
 
+Authentication tests fail with LWP 5.815 and later
+[Doug Schrag]
+
+Concise test won't perform unless StatusTerse is set to ON
+[Doug Schrag]
+
 Look for a usable apxs in $ENV{PATH} if all other options fail, then prompt the user for one.
 [Phred]
 

Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Status.pm?rev=1029211&r1=1029210&r2=1029211&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Sat Oct 30 21:59:46 2010
@@ -178,7 +178,8 @@ sub symdump {
 
     return install_hint("Devel::Symdump") unless has($r, "symdump");
 
-    my $meth = lc($r->dir_config("StatusRdump")) eq "on"
+    # lc generates a (FATAL) warning if $r->dir_config is undef
+    my $meth = lc($r->dir_config("StatusRdump") || '') eq "on"
         ? "rnew" : "new";
     my $sob = Devel::Symdump->$meth($package);
     return $sob->Apache2::Status::as_HTML($package, $r);

Modified: perl/modperl/trunk/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/conf/extra.conf.in?rev=1029211&r1=1029210&r2=1029211&view=diff
==============================================================================
--- perl/modperl/trunk/t/conf/extra.conf.in (original)
+++ perl/modperl/trunk/t/conf/extra.conf.in Sat Oct 30 21:59:46 2010
@@ -83,7 +83,7 @@ PerlModule TestExit::FromPerlModule
 #    PerlSetVar StatusLexInfo On
 #    PerlSetVar StatusDeparse On
 #    PerlSetVar StatusDeparseOptions "-p -sC"
-#    PerlSetVar StatusTerse On
+    PerlSetVar StatusTerse On
 #    PerlSetVar StatusTerseSize On
 #    PerlSetVar StatusTerseSizeMainSummary On
     SetHandler modperl

Modified: perl/modperl/trunk/t/hooks/authen_basic.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/hooks/authen_basic.t?rev=1029211&r1=1029210&r2=1029211&view=diff
==============================================================================
--- perl/modperl/trunk/t/hooks/authen_basic.t (original)
+++ perl/modperl/trunk/t/hooks/authen_basic.t Sat Oct 30 21:59:46 2010
@@ -21,6 +21,10 @@ sok {
     GET_OK $location, username => 'dougm', password => 'foo';
 };
 
+# since LWP 5.815, the user agent retains credentials
+# tell Apache::TestRequest to reinitialize its global agent
+Apache::TestRequest::user_agent(reset => 1);
+
 sok {
     ! GET_OK $location, username => 'dougm', password => 'wrong';
 };

Modified: perl/modperl/trunk/t/hooks/authz.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/hooks/authz.t?rev=1029211&r1=1029210&r2=1029211&view=diff
==============================================================================
--- perl/modperl/trunk/t/hooks/authz.t (original)
+++ perl/modperl/trunk/t/hooks/authz.t Sat Oct 30 21:59:46 2010
@@ -16,6 +16,10 @@ ok $rc == 401;
 
 ok GET_OK $location, username => 'dougm', password => 'foo';
 
+# since LWP 5.815, the user agent retains credentials
+# tell Apache::TestRequest to reinitialize its global agent
+Apache::TestRequest::user_agent(reset => 1);
+
 ok ! GET_OK $location, username => 'jobbob', password => 'whatever';