Commit 1b3e037b authored by Florian Schlichting's avatar Florian Schlichting

Imported Upstream version 2.5.0~rc3

parent f7b4a61c
......@@ -37,7 +37,9 @@
providing uptodate information about the patches
and adaptions for Embperl 2.5.
- Applied further spell corrections from Florian Schlichting.
- Log Errors form Embperl::Syntax::Mail to error log
- Log Errors form Embperl::Syntax::Mail to error log
- Fix compile problem on non intel plattforms due to missing
-m32 flag.
=head 2.4.0 4. Oct 2010
......
......@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# $Id: Embperl.pm 1382642 2012-09-10 05:33:29Z richter $
# $Id: Embperl.pm 1407811 2012-11-10 13:29:36Z richter $
#
###################################################################################
......@@ -50,7 +50,7 @@ use vars qw(
@ISA = qw(Exporter DynaLoader);
$VERSION = '2.5.0_2' ;
$VERSION = '2.5.0_3' ;
if ($modperl = $ENV{MOD_PERL})
......
......@@ -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
......
--- #YAML:1.0
name: Embperl
version: 2.5.0_2
version: 2.5.0_3
abstract: Embed Perl code in HTML documents
author:
- Gerald Richter <richter at embperl dot org>
......
......@@ -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} =~ /^i\d86/) ;
$dynlib = {};
print "\nRunning on Win 32\n" if ($win32) ;
......
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
......@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# $Id: epeval.c 1382642 2012-09-10 05:33:29Z richter $
# $Id: epeval.c 1407810 2012-11-10 13:27:52Z richter $
#
###################################################################################*/
......@@ -64,7 +64,12 @@ int EvalDirect (/*i/o*/ register req * r,
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;
......
......@@ -109,6 +109,16 @@
'errors' => '1',
'version' => 2,
},
'errorfirstrun.htm' => {
'errors' => 1,
'version' => 2,
'condition' => '$] < 5.006000',
},
'errorfirstrun.htm' => {
'errors' => 2,
'version' => 2,
'condition' => '$] >= 5.006000',
},
'unclosed.htm' => {
'errors' => '1',
},
......
<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:.+in Perl code: Global symbol \&quot;\$x\&quot; requires explicit package name at
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
</td></tr>
<tr bgcolor='#eeeeee'><td>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
^\[\d+\]ERR: 24: Error in Perl code: syntax error at .+errorfirstrun.htm line 10
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
</td></tr>
</table>
<br>
^Embperl
</BODY></HTML>
[!
use strict;
sub test
{
$x = 1;
}
!]
[!
5 +
!]
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment