richter 2004/01/16 00:24:26
Modified: . Changes.pod Embperl.pm Embperl.xs Makefile.PL
embpcgi.test.pl.templ epinit.c epmain.c
epocgi.test.pl.templ
test/conf startup.pl
Log:
- fix inc path problem with perl 5.8.2 in make test
- fix taited problem with mod_perl 1.99_12
Revision Changes Path
1.217 +3 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- Changes.pod 2 Jan 2004 15:24:08 -0000 1.216
+++ Changes.pod 16 Jan 2004 08:24:26 -0000 1.217
@@ -12,6 +12,9 @@
Reported by Neil Gunton.
- Fixed include path for non standart apr directories.
- Fixed epchar.c.min and epchar.c.iso-latin-2 to conatin char2xml table
+ - Fixed problem with mod_perl 1.99_12 which reports wrong return value from
+ handler when some variable inside them Embperl page get tainted.
+ - Fixed tests for Perl 5.8.2
=head1 2.0b9 10. Juni 2003
1.183 +14 -5 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- Embperl.pm 11 Apr 2003 05:41:16 -0000 1.182
+++ Embperl.pm 16 Jan 2004 08:24:26 -0000 1.183
@@ -99,14 +99,19 @@
# when called inside a Embperl Request, Execute the component only
return Embperl::Req::ExecuteComponent ($_ep_param, @_) if ($req) ;
+ my $rc ;
if (!ref $_ep_param)
{
- Embperl::Req::ExecuteRequest (undef, { inputfile => $_ep_param, param =>
[EMAIL PROTECTED]) ;
+ $rc = Embperl::Req::ExecuteRequest (undef, { inputfile => $_ep_param, param
=> [EMAIL PROTECTED]) ;
}
else
{
- Embperl::Req::ExecuteRequest (undef, $_ep_param) ;
+ $rc = Embperl::Req::ExecuteRequest (undef, $_ep_param) ;
}
+use Data::Dumper ;
+use Devel::Peek ;
+ #print "2 rc = $rc", Dumper ($rc), , Dump ($rc) ;
+ return $rc ;
}
#######################################################################################
@@ -116,8 +121,12 @@
{
local $SIG{__WARN__} = \&Warn ;
$req_rec = $_[0] ;
-
- Embperl::Req::ExecuteRequest ($_[0]) ;
+ #$req_rec -> log_error ("1 rc = ") ;
+ my $rc = Embperl::Req::ExecuteRequest ($_[0]) ;
+use Data::Dumper ;
+use Devel::Peek ;
+ #$req_rec -> log_error ( "2 rc = $rc", Dumper ($rc), Dump ($rc)) ;
+ return $rc ;
}
#######################################################################################
1.53 +1 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Embperl.xs 12 Jun 2003 20:34:21 -0000 1.52
+++ Embperl.xs 16 Jan 2004 08:24:26 -0000 1.53
@@ -83,6 +83,7 @@
SV * pPerlParam
CODE:
RETVAL = embperl_ExecuteRequest (aTHX_ pApacheReqSV, pPerlParam) ;
+ tainted = 0 ;
OUTPUT:
RETVAL
1.66 +2 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Makefile.PL 2 Jul 2003 07:39:07 -0000 1.65
+++ Makefile.PL 16 Jan 2004 08:24:26 -0000 1.66
@@ -147,6 +147,7 @@
$txt =~ s/\tPERL_DL_NONLAZY=0 /\tSET PATH=\$\(PATH\)\;$EPENVPATH\n\t/g if
($win32) ;
$txt =~ s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/ ; # remove tests for subdirs
+ $txt =~ s/\$\(NOECHO\) cd/\n#\t\$\(NOECHO\) cd/ ; # remove tests for
subdirs
$txt =~ s/\r\n/\n/g ; # make doesn't like \r\n!
1.4 +3 -2 embperl/embpcgi.test.pl.templ
Index: embpcgi.test.pl.templ
===================================================================
RCS file: /home/cvs/embperl/embpcgi.test.pl.templ,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- embpcgi.test.pl.templ 22 Oct 2002 05:29:04 -0000 1.3
+++ embpcgi.test.pl.templ 16 Jan 2004 08:24:26 -0000 1.4
@@ -25,7 +25,8 @@
my $i = 0 ;
foreach (@INC)
{
- $INC[$i] = "$cwd/$_" if (/^(\.\/)?blib/) ;
+ $INC[$i] = "$cwd/$_" if (/^\.?\/?blib/) ;
+ $INC[$i] =~ s#//#/#g ;
$i++ ;
}
%Embperl::initparam = (use_env => 1, use_redirect_env => 1) ;
1.11 +2 -1 embperl/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/epinit.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- epinit.c 9 Jun 2003 18:03:21 -0000 1.10
+++ epinit.c 16 Jan 2004 08:24:26 -0000 1.11
@@ -1698,6 +1698,7 @@
char * sPackage = hv_iterkey (pEntry, &l) ;
ClearSymtab (r, sPackage, r -> Config.bDebug & dbgShowCleanup) ;
}
+ tainted = 0 ;
sv_setsv(r -> pThread -> pReqRV, &sv_undef) ;
1.126 +1 -3 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- epmain.c 9 Jun 2003 18:03:21 -0000 1.125
+++ epmain.c 16 Jan 2004 08:24:26 -0000 1.126
@@ -1422,7 +1422,6 @@
if (r)
embperl_CleanupRequest (r) ;
-
return rc ;
}
@@ -1510,7 +1509,6 @@
tComponent * pComponent ;
rc = embperl_SetupComponent (r, pPerlParam, &pComponent) ;
-
if (rc == ok)
{
rc = embperl_RunComponent (pComponent) ;
1.6 +3 -2 embperl/epocgi.test.pl.templ
Index: epocgi.test.pl.templ
===================================================================
RCS file: /home/cvs/embperl/epocgi.test.pl.templ,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- epocgi.test.pl.templ 22 Oct 2002 05:29:06 -0000 1.5
+++ epocgi.test.pl.templ 16 Jan 2004 08:24:26 -0000 1.6
@@ -22,7 +22,8 @@
my $i = 0 ;
foreach (@INC)
{
- $INC[$i] = "$cwd/$_" if (/^(\.\/)?blib/) ;
+ $INC[$i] = "$cwd/$_" if (/^\.?\/?blib/) ;
+ $INC[$i] =~ s#//#/#g ;
$i++ ;
}
%Embperl::initparam = (use_env => 1, use_redirect_env => 1) ;
1.20 +4 -2 embperl/test/conf/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- startup.pl 27 Feb 2003 07:48:08 -0000 1.19
+++ startup.pl 16 Jan 2004 08:24:26 -0000 1.20
@@ -14,11 +14,11 @@
$ENV{EMBPERL_SRC} =~ /^(.*?)$/;
my $cwd = $1 ; # untaint
- #my $cwd = '/usr/msrc/ep2a' ;
my $i = 0 ;
foreach (@INC)
{
- $INC[$i] = "$cwd/$_" if (/^(\.\/)?blib/) ;
+ $INC[$i] = "$cwd/$_" if (/^\.?\/?blib/) ;
+ $INC[$i] =~ s#//#/#g ;
$i++ ;
}
@@ -51,6 +51,8 @@
$testshare = "Shared Data" ;
$cp -> share ('$testshare') ;
+
+##Embperl::Execute ({ inputfile => "$ENV{EMBPERL_SRC}/test/html/div.htm", import
=> 0, input_escmode => 7 }) ;
1 ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
