[libapache2-mod-perl2] 02/03: Drop 370-Fix-t-directive-perlloadmodule2.t.patch, was taken from upstream.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libapache2-mod-perl2.

commit f05bc770c416a75992cdc1bcf91ab8c5b898f2a4
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Jul 17 23:42:40 2014 +0200

    Drop 370-Fix-t-directive-perlloadmodule2.t.patch, was taken from upstream.
---
 .../370-Fix-t-directive-perlloadmodule2.t.patch    | 32 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 33 deletions(-)

diff --git a/debian/patches/370-Fix-t-directive-perlloadmodule2.t.patch b/debian/patches/370-Fix-t-directive-perlloadmodule2.t.patch
deleted file mode 100644
index e8a0a7c..0000000
--- a/debian/patches/370-Fix-t-directive-perlloadmodule2.t.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 79588dbfc9ff0830d86ba6347b947ecd76e8a981 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at 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.hay at 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
-
diff --git a/debian/patches/series b/debian/patches/series
index f201375..3eaf730 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,5 +16,4 @@ avoid-db-linkage.patch
 340-rewrite-2.4.patch
 350-ap-test-apache24-define.patch
 360-conditional-linux-pid-module.patch
-370-Fix-t-directive-perlloadmodule2.t.patch
 380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git