This is an automated email from the git hooks/post-receive script. dmn pushed a commit to branch master in repository libembperl-perl.
commit f9e825e287fcdeab9052962e02770dc19dc6a984 Author: Damyan Ivanov <[email protected]> Date: Tue Jul 29 13:52:32 2014 +0000 add patch from Niko Tyni adapting tests to changed error message in apache 2.4 Closes: #756382 --- debian/patches/apache2.4-compat.patch | 31 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 32 insertions(+) diff --git a/debian/patches/apache2.4-compat.patch b/debian/patches/apache2.4-compat.patch new file mode 100644 index 0000000..610350a --- /dev/null +++ b/debian/patches/apache2.4-compat.patch @@ -0,0 +1,31 @@ +From bcce23a15de55a39478f83a7923d8a89f681cc19 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <[email protected]> +Date: Tue, 29 Jul 2014 14:34:35 +0300 +Subject: [PATCH] Adapt to an Apache 2.4.10 error page change + +The "Forbidden" error page was slightly changed by Apache commit + + https://github.com/apache/httpd/commit/4f8fc53c8f6df76a42ccc89275fcede766662f9e + https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http/http_protocol.c?r1=1487127&r2=1610328 + +breaking the EmbperlObject/epobase.htm test. The fix works +with both the old and the new page format. +--- + test/cmp/epobase.htm | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/cmp/epobase.htm b/test/cmp/epobase.htm +index ba29386..9d0269c 100644 +--- a/test/cmp/epobase.htm ++++ b/test/cmp/epobase.htm +@@ -5,6 +5,7 @@ + <H1>Forbidden</H1> + ^.*?You don't have permission to access /embperl/EmbperlObject/epobase.htm + ^on this server ++^-</p> + </BODY></HTML> + + +-- +2.0.1 + diff --git a/debian/patches/series b/debian/patches/series index fac1829..30bba0a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ pod-errors.patch +apache2.4-compat.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libembperl-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
