[libembperl-perl] 01/01: Make offline and Apache tests pass
Axel Beckert
abe at deuxchevaux.org
Fri Jan 15 00:19:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository libembperl-perl.
commit 5c125542f3c85d93ab775f5344d9c670d5273fd1
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Fri Jan 15 01:19:20 2016 +0100
Make offline and Apache tests pass
CGI based tests still fail.
Also add a DEP-3 patch header.
---
.../perl5.22-compat-PL_sv_objcount-removal.patch | 146 +++++++++++++++++----
1 file changed, 118 insertions(+), 28 deletions(-)
diff --git a/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch b/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch
index 9f5e726..ecf0bbc 100644
--- a/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch
+++ b/debian/patches/perl5.22-compat-PL_sv_objcount-removal.patch
@@ -1,7 +1,18 @@
+Description: Compatibility fixes for Perl 5.22
+ This covers a) the PL_sv_objcount removal and b) tons of context
+ issues in the test suite -- which may actually indicate a bug in the
+ code and not the test suite..
+ .
+ So far this makes the offline and Apache tests pass, but the second
+ CGI test fails with a 500 server error.
+Author: Axel Beckert <abe at debian.org>
+Bug-Debian: https://bugs.debian.org/806897
+Bug: https://rt.cpan.org/Ticket/Display.html?id=110023
+
Index: libembperl-perl/epmain.c
===================================================================
---- libembperl-perl.orig/epmain.c 2016-01-14 03:18:34.000000000 +0100
-+++ libembperl-perl/epmain.c 2016-01-14 03:19:24.000000000 +0100
+--- libembperl-perl.orig/epmain.c 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/epmain.c 2016-01-15 00:12:44.876011302 +0100
@@ -1506,8 +1506,8 @@
#ifdef DMALLOC
/* unsigned long mark, int not_freed_b, int freed_b, int details_b */
@@ -15,8 +26,8 @@ Index: libembperl-perl/epmain.c
dmalloc_message ( "***TO PREVIOUS REQUEST***\n") ;
Index: libembperl-perl/epnames.h
===================================================================
---- libembperl-perl.orig/epnames.h 2016-01-14 03:18:34.000000000 +0100
-+++ libembperl-perl/epnames.h 2016-01-14 03:19:24.000000000 +0100
+--- libembperl-perl.orig/epnames.h 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/epnames.h 2016-01-15 00:12:44.876011302 +0100
@@ -325,9 +325,6 @@
#ifndef sv_count
#define sv_count PL_sv_count
@@ -29,8 +40,8 @@ Index: libembperl-perl/epnames.h
#endif
Index: libembperl-perl/Old.xs
===================================================================
---- libembperl-perl.orig/Old.xs 2016-01-14 03:18:34.000000000 +0100
-+++ libembperl-perl/Old.xs 2016-01-14 03:19:24.000000000 +0100
+--- libembperl-perl.orig/Old.xs 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/Old.xs 2016-01-15 00:12:44.880011290 +0100
@@ -252,7 +252,7 @@
tReq * r
char * sText
@@ -42,8 +53,8 @@ Index: libembperl-perl/Old.xs
embperl_Escape(r, str, mode)
Index: libembperl-perl/test/html/plain.htm
===================================================================
---- libembperl-perl.orig/test/html/plain.htm 2016-01-14 03:18:34.000000000 +0100
-+++ libembperl-perl/test/html/plain.htm 2016-01-14 03:19:24.000000000 +0100
+--- libembperl-perl.orig/test/html/plain.htm 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test/html/plain.htm 2016-01-15 00:12:44.880011290 +0100
@@ -20,8 +20,8 @@
ARRAY @d = [+ do { my @tmp1 = @d; "@tmp1" } +] num = [+ @d +] <BR>
@@ -68,8 +79,8 @@ Index: libembperl-perl/test/html/plain.htm
Index: libembperl-perl/test/cmp/errorfirstrun.htm
===================================================================
---- libembperl-perl.orig/test/cmp/errorfirstrun.htm 2016-01-14 03:18:34.000000000 +0100
-+++ libembperl-perl/test/cmp/errorfirstrun.htm 2016-01-14 03:19:24.000000000 +0100
+--- libembperl-perl.orig/test/cmp/errorfirstrun.htm 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test/cmp/errorfirstrun.htm 2016-01-15 00:12:44.880011290 +0100
@@ -5,7 +5,7 @@
<table cellspacing='2' cellpadding='5'>
<tr bgcolor='#eeeeee'><td>
@@ -81,8 +92,8 @@ Index: libembperl-perl/test/cmp/errorfirstrun.htm
<tr bgcolor='#eeeeee'><td>
Index: libembperl-perl/test/cmp/varerr.htm56
===================================================================
---- libembperl-perl.orig/test/cmp/varerr.htm56 2016-01-14 03:18:34.000000000 +0100
-+++ libembperl-perl/test/cmp/varerr.htm56 2016-01-14 03:19:24.000000000 +0100
+--- libembperl-perl.orig/test/cmp/varerr.htm56 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test/cmp/varerr.htm56 2016-01-15 00:12:44.880011290 +0100
@@ -9,13 +9,13 @@
<table cellspacing='2' cellpadding='5'>
<tr bgcolor='#eeeeee'><td>
@@ -106,8 +117,8 @@ Index: libembperl-perl/test/cmp/varerr.htm56
</table>
Index: libembperl-perl/test.pl
===================================================================
---- libembperl-perl.orig/test.pl 2016-01-14 03:19:24.000000000 +0100
-+++ libembperl-perl/test.pl 2016-01-14 03:19:24.000000000 +0100
+--- libembperl-perl.orig/test.pl 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test.pl 2016-01-15 00:12:44.880011290 +0100
@@ -2125,7 +2125,7 @@
unshift (@testargs, 'dbgbreak') if ($opt_dbgbreak) ;
@@ -218,8 +229,8 @@ Index: libembperl-perl/test.pl
Index: libembperl-perl/test/html/mdatsess.htm
===================================================================
---- libembperl-perl.orig/test/html/mdatsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/mdatsess.htm 2016-01-14 03:21:32.586137846 +0100
+--- libembperl-perl.orig/test/html/mdatsess.htm 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test/html/mdatsess.htm 2016-01-15 00:12:44.880011290 +0100
@@ -13,7 +13,7 @@
}
-]
@@ -231,8 +242,8 @@ Index: libembperl-perl/test/html/mdatsess.htm
equal ? [+ ($mdat{cnt} == $fdat{cnt})?'yes':'no' +] <br>
Index: libembperl-perl/test/html/getsess.htm
===================================================================
---- libembperl-perl.orig/test/html/getsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/getsess.htm 2016-01-14 03:38:13.211682827 +0100
+--- libembperl-perl.orig/test/html/getsess.htm 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test/html/getsess.htm 2016-01-15 00:12:44.884011278 +0100
@@ -41,7 +41,7 @@
<table>
@@ -253,8 +264,8 @@ Index: libembperl-perl/test/html/getsess.htm
Index: libembperl-perl/test/html/execgetsess.htm
===================================================================
---- libembperl-perl.orig/test/html/execgetsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/execgetsess.htm 2016-01-14 03:51:13.225791835 +0100
+--- libembperl-perl.orig/test/html/execgetsess.htm 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test/html/execgetsess.htm 2016-01-15 00:12:44.884011278 +0100
@@ -13,7 +13,7 @@
<table>
@@ -284,8 +295,8 @@ Index: libembperl-perl/test/html/execgetsess.htm
Index: libembperl-perl/test/html/delwrsess.htm
===================================================================
---- libembperl-perl.orig/test/html/delwrsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/delwrsess.htm 2016-01-14 03:49:12.546075932 +0100
+--- libembperl-perl.orig/test/html/delwrsess.htm 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test/html/delwrsess.htm 2016-01-15 00:12:44.884011278 +0100
@@ -11,13 +11,13 @@
<table>
@@ -322,8 +333,8 @@ Index: libembperl-perl/test/html/delwrsess.htm
Index: libembperl-perl/test/html/getbsess.htm
===================================================================
---- libembperl-perl.orig/test/html/getbsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/getbsess.htm 2016-01-14 03:55:18.685255504 +0100
+--- libembperl-perl.orig/test/html/getbsess.htm 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test/html/getbsess.htm 2016-01-15 00:12:44.884011278 +0100
@@ -22,7 +22,7 @@
<table>
@@ -344,8 +355,8 @@ Index: libembperl-perl/test/html/getbsess.htm
Index: libembperl-perl/test/html/delrdsess.htm
===================================================================
---- libembperl-perl.orig/test/html/delrdsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/delrdsess.htm 2016-01-14 03:58:58.600779742 +0100
+--- libembperl-perl.orig/test/html/delrdsess.htm 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test/html/delrdsess.htm 2016-01-15 00:12:44.884011278 +0100
@@ -11,13 +11,13 @@
<table>
@@ -373,8 +384,8 @@ Index: libembperl-perl/test/html/delrdsess.htm
Index: libembperl-perl/test/html/getdelsess.htm
===================================================================
---- libembperl-perl.orig/test/html/getdelsess.htm 2014-10-13 23:44:08.661838975 +0200
-+++ libembperl-perl/test/html/getdelsess.htm 2016-01-14 04:00:58.256519445 +0100
+--- libembperl-perl.orig/test/html/getdelsess.htm 2016-01-15 00:12:44.888011266 +0100
++++ libembperl-perl/test/html/getdelsess.htm 2016-01-15 00:12:44.884011278 +0100
@@ -36,7 +36,7 @@
-]
@@ -384,3 +395,82 @@ Index: libembperl-perl/test/html/getdelsess.htm
$udat{cnt} = -[+ $udat{cnt} +]- <br>
+Index: libembperl-perl/test/html/delsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/delsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/delsess.htm 2016-01-15 00:36:34.567890757 +0100
+@@ -11,13 +11,13 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+ [+ $num > 0?"ok (num=$num)":"Not a session hash (num=$num)" +]<p>
+
+- $mdat{cnt} = -[+ $mdat{cnt} +]- <br>
++ $mdat{cnt} = -[+ 0+$mdat{cnt} +]- <br>
+ $udat{cnt} = -[+ $udat{cnt} +]- <br>
+
+ [- $_[0] -> DeleteSession (1) ; -]
+Index: libembperl-perl/test/html/setbadsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/setbadsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/setbadsess.htm 2016-01-15 00:49:32.293852894 +0100
+@@ -10,6 +10,6 @@
+ $udat{$k} = $fdat{$k} ;
+ }
+ -]
+- [+ $udat{_session_id} +]
++ [+ ''.$udat{_session_id} +]
+ </body>
+ </html>
+Index: libembperl-perl/test/html/setunknownsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/setunknownsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/setunknownsess.htm 2016-01-15 00:51:51.757524619 +0100
+@@ -10,6 +10,6 @@
+ $udat{$k} = $fdat{$k} ;
+ }
+ -]
+- [+ $udat{_session_id} +]
++ [+ ''.$udat{_session_id} +]
+ </body>
+ </html>
+Index: libembperl-perl/test/html/sidurl/geturlsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/sidurl/geturlsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/sidurl/geturlsess.htm 2016-01-15 01:04:46.919657023 +0100
+@@ -41,7 +41,7 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $udat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$udat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
+@@ -55,7 +55,7 @@
+ -]
+
+
+- $mdat{cnt} = -[+ $mdat{cnt} +]- <br>
++ $mdat{cnt} = -[+ 0+$mdat{cnt} +]- <br>
+ $udat{cnt} = -[+ $udat{cnt} +]- <br>
+
+
+Index: libembperl-perl/test/html/sidurl/getsdaturlsess.htm
+===================================================================
+--- libembperl-perl.orig/test/html/sidurl/getsdaturlsess.htm 2014-10-13 23:44:08.661838975 +0200
++++ libembperl-perl/test/html/sidurl/getsdaturlsess.htm 2016-01-15 01:07:37.859244096 +0100
+@@ -22,7 +22,7 @@
+
+ <table>
+ <tr>
+- <td>[+ $ks[$row] +]</td><td>[+ $sdat{$ks[$row] || ''} +]</td>
++ <td>[+ $ks[$row] +]</td><td>[+ 0+$sdat{$ks[$row] || ''} +]</td>
+ </tr>
+ </table>
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libembperl-perl.git
More information about the Pkg-perl-cvs-commits
mailing list