You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2001/01/10 07:21:23 UTC
cvs commit: embperl/test/html/EmbperlObject/sub epobless2.htm eposubs2.htm
richter 01/01/09 22:21:23
Modified: . Embperl.pm MANIFEST test.pl
Added: test/cmp epobless2.htm
test/html/EmbperlObject/sub epobless2.htm eposubs2.htm
Log:
- Fix for Execute isa parameter
Revision Changes Path
1.138 +9 -4 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- Embperl.pm 2000/12/23 20:13:16 1.137
+++ Embperl.pm 2001/01/10 06:21:22 1.138
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.137 2000/12/23 20:13:16 richter Exp $
+# $Id: Embperl.pm,v 1.138 2001/01/10 06:21:22 richter Exp $
#
###################################################################################
@@ -81,7 +81,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '1.3.0';
+$VERSION = '1.3.1_dev';
# HTML::Embperl cannot be bootstrapped in nonlazy mode except
# under mod_perl, because its dependencies import symbols like ap_palloc
@@ -985,10 +985,15 @@
}
$rc = $r -> Error?500:0 ;
+ }
+
+ if ($req -> {'isa'})
+ {
no strict ;
- push @{caller () . '::ISA'}, $package if ($req -> {'isa'}) ;
+ my $callerisa = \@{caller () . '::ISA'} ;
+ push @$callerisa, $package if (!grep ($_ eq $package, @$callerisa)) ;
use strict ;
- }
+ }
@{$req -> {errors}} = @{$r -> ErrArray()} if (ref ($req -> {errors}) eq 'ARRAY') ;
1.60 +3 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- MANIFEST 2000/12/23 20:13:20 1.59
+++ MANIFEST 2001/01/10 06:21:22 1.60
@@ -162,6 +162,8 @@
test/html/EmbperlObject/eposubs.htm
test/html/EmbperlObject/sub/eposubs.htm
test/html/EmbperlObject/sub/epobless.htm
+test/html/EmbperlObject/sub/eposubs2.htm
+test/html/EmbperlObject/sub/epobless2.htm
test/html/EmbperlObject/obj/epobase.htm
test/html/EmbperlObject/obj/epohead.htm
test/html/EmbperlObject/obj/epofoot.htm
@@ -264,6 +266,7 @@
test/cmp/epostopdir.htm
test/cmp/epobaselib.htm
test/cmp/epobless.htm
+test/cmp/epobless2.htm
test/cmp/getbsess.htm
test/cmp/delrdsess.htm
test/cmp/delwrsess.htm
1.89 +5 -0 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- test.pl 2000/12/23 20:13:20 1.88
+++ test.pl 2001/01/10 06:21:22 1.89
@@ -434,6 +434,11 @@
'cgi' => 0,
'repeat' => 2,
},
+ 'EmbperlObject/sub/epobless2.htm' => {
+ 'offline' => 0,
+ 'cgi' => 0,
+ 'repeat' => 2,
+ },
'EmbperlObject/obj/epoobj1.htm' => {
'offline' => 0,
'cgi' => 0,
1.1 embperl/test/cmp/epobless2.htm
Index: epobless2.htm
===================================================================
<html>
<head>
<title>Example</title>
</head>
<body>
<h1>another head from sub</h1>
txt1: txt1 from same dir in eposubs2 <br>
txt2: txt2 from base dir <br>
<hr> Footer <hr>
</body>
</html>
1.1 embperl/test/html/EmbperlObject/sub/epobless2.htm
Index: epobless2.htm
===================================================================
[- $subs = Execute ({'object' => 'eposubs2.htm'}) -]
txt1: [+ $subs -> txt1 +] <br>
txt2: [+ $subs -> txt2 +] <br>
1.1 embperl/test/html/EmbperlObject/sub/eposubs2.htm
Index: eposubs2.htm
===================================================================
[! $subs = Execute ({'isa' => '../eposubs.htm'}) !]
[!
sub txt1 { "txt1 from same dir in eposubs2" } ;
!]
** same dir **