Author: richter
Date: Sat Nov 10 13:27:52 2012
New Revision: 1407810
URL: http://svn.apache.org/viewvc?rev=1407810&view=rev
Log:
- Remove G_KEEKERR for Perl 5.14 also for [! !] blocks
Added:
perl/embperl/trunk/test/cmp/errorfirstrun.htm
perl/embperl/trunk/test/html/errorfirstrun.htm
Modified:
perl/embperl/trunk/MANIFEST
perl/embperl/trunk/Makefile.PL
perl/embperl/trunk/TODO
perl/embperl/trunk/epeval.c
perl/embperl/trunk/test.pl
Modified: perl/embperl/trunk/MANIFEST
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/MANIFEST?rev=1407810&r1=1407809&r2=1407810&view=diff
==============================================================================
--- perl/embperl/trunk/MANIFEST (original)
+++ perl/embperl/trunk/MANIFEST Sat Nov 10 13:27:52 2012
@@ -289,6 +289,7 @@ test/cmp/errdoc2.htm
test/cmp/error.htm
test/cmp/errormismatch.htm
test/cmp/errormismatchcmd.htm
+test/cmp/errorfirstrun.htm
test/cmp/errpage.htm
test/cmp/escape.htm
test/cmp/escraw.htm
@@ -493,6 +494,7 @@ test/html/errdoc/errdoc.htm
test/html/errmsg.htm
test/html/errmsg2.htm
test/html/error.htm
+test/html/errorfirstrun.htm
test/html/escape.htm
test/html/escraw.htm
test/html/escutf8.htm
Modified: perl/embperl/trunk/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Makefile.PL?rev=1407810&r1=1407809&r2=1407810&view=diff
==============================================================================
--- perl/embperl/trunk/Makefile.PL (original)
+++ perl/embperl/trunk/Makefile.PL Sat Nov 10 13:27:52 2012
@@ -15,7 +15,7 @@ use Data::Dumper ;
$win32 = ($Config{osname} =~ /win32/i) ;
$aix = ($Config{osname} =~ /aix/i);
-$perl32bit = $Config{ptrsize} == 4 ;
+$perl32bit = $Config{ptrsize} == 4 && ($Config{archname} =~ /^x86_64/) ;
$dynlib = {};
print "\nRunning on Win 32\n" if ($win32) ;
Modified: perl/embperl/trunk/TODO
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/TODO?rev=1407810&r1=1407809&r2=1407810&view=diff
==============================================================================
--- perl/embperl/trunk/TODO (original)
+++ perl/embperl/trunk/TODO Sat Nov 10 13:27:52 2012
@@ -1,27 +1,5 @@
TODO
+- use perlio (e.g. utf8 encoding) for reading files
-- doc that %mdat is per application
-
-- check memory on recompile of epl files
-
-- escape.htm hash order [ abe 7.3.05]
-
-- content-type in Embperl::Mail [ abe 4.4.05]
-
-- %Udat not clearing after 500 error [Cliff Raymann]
-
-- $req_rec not available in preload pages [Neil Gunton]
-
-- Check CGI.pm version >= 3.10 in Makefile.PL [Gavin Carr, 4.10.05]
-
-- Make enity substitution for xslt configurable [Kathryn Anderson, 22.12.05]
-
-- Apache2:compat fuer session setup [Aare Vesi 1.2.06]
-
-TODO for Embperl 2.1 and later
-
-- make Embperl run with threads and threaded Apache 2
-
-- make Embperl::Mail us Embperl configuration
Modified: perl/embperl/trunk/epeval.c
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/epeval.c?rev=1407810&r1=1407809&r2=1407810&view=diff
==============================================================================
--- perl/embperl/trunk/epeval.c (original)
+++ perl/embperl/trunk/epeval.c Sat Nov 10 13:27:52 2012
@@ -64,7 +64,12 @@ int EvalDirect (/*i/o*/ register req *
XPUSHs(pArgs [num]) ; /* push pointer to argument */
PUTBACK;
+#if PERL_VERSION >= 14
+ n = perl_eval_sv(pArg, G_SCALAR);
+#else
n = perl_eval_sv(pArg, G_SCALAR | G_KEEPERR);
+#endif
+
SPAGAIN;
if (n > 0)
pSVErr = POPs;
Modified: perl/embperl/trunk/test.pl
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/test.pl?rev=1407810&r1=1407809&r2=1407810&view=diff
==============================================================================
--- perl/embperl/trunk/test.pl (original)
+++ perl/embperl/trunk/test.pl Sat Nov 10 13:27:52 2012
@@ -109,6 +109,10 @@
'errors' => '1',
'version' => 2,
},
+ 'errorfirstrun.htm' => {
+ 'errors' => '1',
+ 'version' => 2,
+ },
'unclosed.htm' => {
'errors' => '1',
},
Added: perl/embperl/trunk/test/cmp/errorfirstrun.htm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/test/cmp/errorfirstrun.htm?rev=1407810&view=auto
==============================================================================
--- perl/embperl/trunk/test/cmp/errorfirstrun.htm (added)
+++ perl/embperl/trunk/test/cmp/errorfirstrun.htm Sat Nov 10 13:27:52 2012
@@ -0,0 +1,15 @@
+<HTML><HEAD><TITLE>Embperl Error</TITLE></HEAD><BODY bgcolor="#FFFFFF">
+<H1>Internal Server Error</H1>
+The server encountered an internal error or misconfiguration and was unable to
complete your request.<P>
+^Please contact the server administrator
+<table cellspacing='2' cellpadding='5'>
+<tr bgcolor='#eeeeee'><td>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+^\[\d+\]ERR: 24: Error in Perl code: Global symbol \"\$x\"
requires explicit package name at
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+</td></tr>
+</table>
+<br>
+^Embperl
+</BODY></HTML>
+
Added: perl/embperl/trunk/test/html/errorfirstrun.htm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/test/html/errorfirstrun.htm?rev=1407810&view=auto
==============================================================================
--- perl/embperl/trunk/test/html/errorfirstrun.htm (added)
+++ perl/embperl/trunk/test/html/errorfirstrun.htm Sat Nov 10 13:27:52 2012
@@ -0,0 +1,7 @@
+[!
+use strict;
+sub test
+{
+ $x = 1;
+}
+!]
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
