Author: richter
Date: Sun Oct 3 18:50:24 2010
New Revision: 1004025
URL: http://svn.apache.org/viewvc?rev=1004025&view=rev
Log:
- Fix Execute parameter app_name (was appname, but app_name
is correct, appname is still accepted, but might not always
work)
- Add parameter checks for Execute parameters to avoid segfaults
in case of non refs where refs are expected.
- Add more controls to Embperl::Form
Modified:
perl/embperl/trunk/Changes.pod
perl/embperl/trunk/Embperl.pm
perl/embperl/trunk/Embperl/Object.pm
perl/embperl/trunk/MANIFEST
perl/embperl/trunk/epinit.c
perl/embperl/trunk/test.pl
Modified: perl/embperl/trunk/Changes.pod
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Changes.pod?rev=1004025&r1=1004024&r2=1004025&view=diff
==============================================================================
--- perl/embperl/trunk/Changes.pod (original)
+++ perl/embperl/trunk/Changes.pod Sun Oct 3 18:50:24 2010
@@ -1,6 +1,6 @@
=pod
-=head 2.4.0
+=head 2.4.0 4. Oct 2010
- Support for CGI.pm 3.43 (included within Perl 5.10.1)
for file uplaods. CGI.pm < 2.43 is not supported anymore.
@@ -18,6 +18,12 @@
- Do not link against unused libz
- Supports now Perl 5.12: Cope with changed flags G_ARRAY
and G_SCALAR, SVt_RV is now SVt_IV
+ - Fix Execute parameter app_name (was appname, but app_name
+ is correct, appname is still accepted, but might not always
+ work)
+ - Add parameter checks for Execute parameters to avoid segfaults
+ in case of non refs where refs are expected.
+ - Add more controls to Embperl::Form
=head1 2.3.0 30. Sept. 2007
Modified: perl/embperl/trunk/Embperl.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl.pm?rev=1004025&r1=1004024&r2=1004025&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl.pm (original)
+++ perl/embperl/trunk/Embperl.pm Sun Oct 3 18:50:24 2010
@@ -49,7 +49,7 @@ use vars qw(
@ISA = qw(Exporter DynaLoader);
-$VERSION = '2.4.0_3' ;
+$VERSION = '2.4.0' ;
if ($modperl = $ENV{MOD_PERL})
Modified: perl/embperl/trunk/Embperl/Object.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Object.pm?rev=1004025&r1=1004024&r2=1004025&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Object.pm (original)
+++ perl/embperl/trunk/Embperl/Object.pm Sun Oct 3 18:50:24 2010
@@ -48,7 +48,7 @@ use vars qw(
@ISA = qw(Exporter DynaLoader);
-$VERSION = '2.1.0';
+$VERSION = '2.4.0';
$volume = (File::Spec -> splitpath ($Embperl::cwd))[0] ;
Modified: perl/embperl/trunk/MANIFEST
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/MANIFEST?rev=1004025&r1=1004024&r2=1004025&view=diff
==============================================================================
--- perl/embperl/trunk/MANIFEST (original)
+++ perl/embperl/trunk/MANIFEST Sun Oct 3 18:50:24 2010
@@ -16,23 +16,31 @@ Embperl/Form/Control/blank.pm
Embperl/Form/Control/button.pm
Embperl/Form/Control/checkbox.pm
Embperl/Form/Control/checkboxes.pm
+Embperl/Form/Control/datetime.pm
Embperl/Form/Control/display.pm
Embperl/Form/Control/displaylink.pm
Embperl/Form/Control/dump.pm
+Embperl/Form/Control/duration.pm
Embperl/Form/Control/table.pm
Embperl/Form/Control/file.pm
Embperl/Form/Control/grid.pm
Embperl/Form/Control/hidden.pm
Embperl/Form/Control/info.pm
Embperl/Form/Control/input.pm
+Embperl/Form/Control/inputjoin.pm
+Embperl/Form/Control/inputlist.pm
+Embperl/Form/Control/line.pm
Embperl/Form/Control/label.pm
Embperl/Form/Control/mult.pm
Embperl/Form/Control/number.pm
Embperl/Form/Control/password.pm
+Embperl/Form/Control/price.pm
Embperl/Form/Control/radio.pm
Embperl/Form/Control/select.pm
+Embperl/Form/Control/scriptcode.pm
Embperl/Form/Control/selectdyn.pm
Embperl/Form/Control/submit.pm
+Embperl/Form/Control/show.pm
Embperl/Form/Control/tabs.pm
Embperl/Form/Control/textarea.pm
Embperl/Form/Control/table.pm
Modified: perl/embperl/trunk/epinit.c
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/epinit.c?rev=1004025&r1=1004024&r2=1004025&view=diff
==============================================================================
--- perl/embperl/trunk/epinit.c (original)
+++ perl/embperl/trunk/epinit.c Sun Oct 3 18:50:24 2010
@@ -598,7 +598,9 @@ int embperl_SetupApp (/*in*/ pTHX
if (pPerlParam && SvROK(pPerlParam))
{
pParam = (HV *)SvRV(pPerlParam) ;
- sAppName = GetHashValueStr (aTHX_ pParam, "appname", NULL) ;
+ sAppName = GetHashValueStr (aTHX_ pParam, "app_name", NULL) ;
+ if (!sAppName) // backward compability to broken appname
+ sAppName = GetHashValueStr (aTHX_ pParam, "appname", NULL) ;
}
if (!sAppName)
@@ -2043,6 +2045,8 @@ int embperl_SetupComponent (/*in*/ t
}
c -> sCWD = pPrev?pPrev -> sCWD:r -> sInitialCWD ;
+ if (c -> sCWD == NULL)
+ c -> sCWD = "" ;
NewEscMode (r, NULL) ;
c -> bEscModeSet = 0 ;
Modified: perl/embperl/trunk/test.pl
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/test.pl?rev=1004025&r1=1004024&r2=1004025&view=diff
==============================================================================
--- perl/embperl/trunk/test.pl (original)
+++ perl/embperl/trunk/test.pl Sun Oct 3 18:50:24 2010
@@ -2328,6 +2328,49 @@ do
print "ok\n" unless ($err) ;
}
+ if ($err == 0 || $opt_ignoreerror)
+ {
+ $txt2 = "errornous parameter (path) ...";
+ $txt2 .= ' ' x (30 - length ($txt2)) ;
+ print $txt2 ;
+
+ $err = eval { Embperl::Execute ({'inputfile' => $src,
+ 'errors' => \...@errors,
+ path => "not an array ref",
+ }) ; } ;
+ $err ||= 0 ;
+ if ($@ !~ /^Need an Array reference/)
+ {
+ print "\n\n\$@ is wrong, is = '$@', should 'Need an Array
reference'\n" ;
+ $err = 1 ;
+ }
+
+ print "ok\n" unless ($err) ;
+ }
+
+ if ($err == 0 || $opt_ignoreerror)
+ {
+ $txt2 = "errornous parameter (input) ...";
+ $txt2 .= ' ' x (30 - length ($txt2)) ;
+ print $txt2 ;
+ my $out ;
+
+ $err = Embperl::Execute ({'inputfile' => $src,
+ 'errors' => \...@errors,
+ input => $out,
+ }) ;
+ $err = CheckError (1) ;
+
+ if (@errors != 1)
+ {
+ print "\n...@errors does not return correct number of
errors (is " . scalar(@errors) . ", should 1)\n" ;
+ $err = 1 ;
+ }
+
+
+ print "ok\n" unless ($err) ;
+ }
+
foreach $src (
'EmbperlObject/epopage1.htm',
'EmbperlObject/sub/epopage2.htm', 'EmbperlObject/obj/epoobj3.htm',
'EmbperlObject/sub/epobless.htm',
'EmbperlObject/sub/epobless.htm',
@@ -2365,7 +2408,7 @@ do
$err = Embperl::Object::Execute ({'inputfile' =>
"$EPPATH/$inpath/$src",
'object_base' =>
'epobase.htm',
($app?('object_app' =>
$app):()),
- 'appname' => "eo_$app",
+ 'app_name' =>
"eo_$app",
'debug' =>
$defaultdebug,
'outputfile' => $outfile,
'errors' => \...@errors,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]