tag 750240 patch thanks On Tue, Jun 03, 2014 at 10:46:20PM +0300, Damyan Ivanov wrote: > -=| Damyan Ivanov, 03.06.2014 21:42:14 +0300 |=- > > I tried to find the reason and failed. Documenting what I did in the > > hope that it helps in the future.
> Applying the following patch makes the test pass: [...] > So it seems with perl 5.20 $r->args is undefined if there is no query > string. Strange. > > With the above two patches the test suite completes. There are > problems in the install phase because of usr/lib/perl5 no longer > existing, but that should be trivial to fix. Those patches were also included upstream. I'm attaching annotated patches for them. I was able to get 2.0.8+httpd24-r1449661-7 + these patches build with Perl 5.20. Yay! I think this is the last major obstacle to the Perl 5.20 transition, we have patches for the rest. I'm only wondering if 2.0.8+httpd24-r1449661-7 should transition to testing first to help the s390x-perlapi-5.18.2d transition. Emilio: any preference? -- Niko Tyni nt...@debian.org
>From 79588dbfc9ff0830d86ba6347b947ecd76e8a981 Mon Sep 17 00:00:00 2001 From: Niko Tyni <nt...@debian.org> Date: Sun, 29 Jun 2014 12:08:15 +0300 Subject: [PATCH 1/2] Fix t/directive/perlloadmodule2.t The third test (for $url/subdir) was failing because the absence of an argument ($url?...) caused a warning that $r->arg was undefined in perlloadmodule2.pm, and the "use warnings FATAL => 'all';" line saw to it that the server returned 500/Internal Server Error in this case. Author: Steve Hay <steve.m....@googlemail.com> Origin: upstream, http://svn.apache.org/viewvc?view=revision&revision=1565579 --- t/response/TestDirective/perlloadmodule2.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/response/TestDirective/perlloadmodule2.pm b/t/response/TestDirective/perlloadmodule2.pm index 7c24be3..bab91ce 100644 --- a/t/response/TestDirective/perlloadmodule2.pm +++ b/t/response/TestDirective/perlloadmodule2.pm @@ -82,7 +82,7 @@ sub handler : method { my $s = $r->server; - if ($r->args eq 'srv') { + if (defined $r->args and $r->args eq 'srv') { my $srv_cfg = $self->get_config($s); $r->print("srv: @{ $srv_cfg->{MyMergeTest}||[] }"); } -- 2.0.1
>From e2dba731a20ae4866c2a10e42282f8b25993383e Mon Sep 17 00:00:00 2001 From: Niko Tyni <nt...@debian.org> Date: Tue, 15 Jul 2014 21:20:06 +0300 Subject: [PATCH 2/2] Fix reload.t as per r1565579. Reported in CPAN RT#96656. Author: Steve Hay <steve.m....@googlemail.com> Origin: upstream, http://svn.apache.org/viewvc?view=revision&revision=1605020 Bug: https://rt.cpan.org/Public/Bug/Display.html?id=96656 --- Apache-Reload/t/lib/Apache2/TestReload.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apache-Reload/t/lib/Apache2/TestReload.pm b/Apache-Reload/t/lib/Apache2/TestReload.pm index 65f0f04..aa4215f 100644 --- a/Apache-Reload/t/lib/Apache2/TestReload.pm +++ b/Apache-Reload/t/lib/Apache2/TestReload.pm @@ -15,7 +15,7 @@ our $pass = 0; sub handler { my $r = shift; $pass++; - if ($r->args eq 'last') { + if (defined $r->args and $r->args eq 'last') { Apache2::Reload->unregister_module($package); ModPerl::Util::unload_package($package); $pass = 0; -- 2.0.1
