Author: torsten Date: Fri Dec 24 13:36:56 2010 New Revision: 1052503 URL: http://svn.apache.org/viewvc?rev=1052503&view=rev Log: Merged revisions 1029211,1052232 via svnmerge from https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........ r1029211 | phred | 2010-10-30 23:59:46 +0200 (Sat, 30 Oct 2010) | 7 lines 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 ........ r1052232 | stevehay | 2010-12-23 12:45:32 +0100 (Thu, 23 Dec 2010) | 1 line Make PerlIOApache_write() throw an APR::Error object, rather than just a string error, if modperl_wbucket_write() fails. ........ Modified: perl/modperl/branches/threading/ (props changed) perl/modperl/branches/threading/Changes perl/modperl/branches/threading/lib/Apache2/Status.pm perl/modperl/branches/threading/src/modules/perl/modperl_io_apache.c perl/modperl/branches/threading/t/conf/extra.conf.in perl/modperl/branches/threading/t/hooks/authen_basic.t perl/modperl/branches/threading/t/hooks/authz.t Propchange: perl/modperl/branches/threading/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 24 13:36:56 2010 @@ -1 +1 @@ -/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553 +/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232 Propchange: perl/modperl/branches/threading/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Dec 24 13:36:56 2010 @@ -1 +1 @@ -/perl/modperl/trunk:1-712967,712969-1024315 +/perl/modperl/trunk:1-712967,712969-1052502 Modified: perl/modperl/branches/threading/Changes URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/Changes?rev=1052503&r1=1052502&r2=1052503&view=diff ============================================================================== --- perl/modperl/branches/threading/Changes (original) +++ perl/modperl/branches/threading/Changes Fri Dec 24 13:36:56 2010 @@ -31,6 +31,16 @@ Expose modperl_interp_t via ModPerl::Int =item 2.0.5-dev +PerlIOApache_write() now throws an APR::Error object, rather than just a string +error, if modperl_wbucket_write() fails. +[Steve Hay] + +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/branches/threading/lib/Apache2/Status.pm URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/lib/Apache2/Status.pm?rev=1052503&r1=1052502&r2=1052503&view=diff ============================================================================== --- perl/modperl/branches/threading/lib/Apache2/Status.pm (original) +++ perl/modperl/branches/threading/lib/Apache2/Status.pm Fri Dec 24 13:36:56 2010 @@ -179,7 +179,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/branches/threading/src/modules/perl/modperl_io_apache.c URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_io_apache.c?rev=1052503&r1=1052502&r2=1052503&view=diff ============================================================================== --- perl/modperl/branches/threading/src/modules/perl/modperl_io_apache.c (original) +++ perl/modperl/branches/threading/src/modules/perl/modperl_io_apache.c Fri Dec 24 13:36:56 2010 @@ -126,7 +126,6 @@ PerlIOApache_write(pTHX_ PerlIO *f, cons PerlIOApache *st = PerlIOSelf(f, PerlIOApache); modperl_config_req_t *rcfg = modperl_config_req_get(st->r); apr_size_t bytes = 0; - apr_status_t rv; if (!(PerlIOBase(f)->flags & PERLIO_F_CANWRITE)) { return 0; @@ -137,10 +136,9 @@ PerlIOApache_write(pTHX_ PerlIO *f, cons MP_TRACE_o(MP_FUNC, "%4db [%s]", count, MP_TRACE_STR_TRUNC(rcfg->wbucket->pool, vbuf, count)); - rv = modperl_wbucket_write(aTHX_ rcfg->wbucket, vbuf, &count); - if (rv != APR_SUCCESS) { - Perl_croak(aTHX_ modperl_error_strerror(aTHX_ rv)); - } + MP_RUN_CROAK(modperl_wbucket_write(aTHX_ rcfg->wbucket, vbuf, &count), + ":Apache2 IO write"); + bytes += count; return (SSize_t) bytes; Modified: perl/modperl/branches/threading/t/conf/extra.conf.in URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/conf/extra.conf.in?rev=1052503&r1=1052502&r2=1052503&view=diff ============================================================================== --- perl/modperl/branches/threading/t/conf/extra.conf.in (original) +++ perl/modperl/branches/threading/t/conf/extra.conf.in Fri Dec 24 13:36:56 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/branches/threading/t/hooks/authen_basic.t URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/hooks/authen_basic.t?rev=1052503&r1=1052502&r2=1052503&view=diff ============================================================================== --- perl/modperl/branches/threading/t/hooks/authen_basic.t (original) +++ perl/modperl/branches/threading/t/hooks/authen_basic.t Fri Dec 24 13:36:56 2010 @@ -22,6 +22,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/branches/threading/t/hooks/authz.t URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/hooks/authz.t?rev=1052503&r1=1052502&r2=1052503&view=diff ============================================================================== --- perl/modperl/branches/threading/t/hooks/authz.t (original) +++ perl/modperl/branches/threading/t/hooks/authz.t Fri Dec 24 13:36:56 2010 @@ -17,6 +17,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';
