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/06/04 20:57:46 UTC
cvs commit: embperl Changes.pod Embperl.pm epmacro.h epmain.c epocgi.test.pl.templ
richter 01/06/04 11:57:46
Modified: . Changes.pod Embperl.pm epmacro.h epmain.c
epocgi.test.pl.templ
Log:
- fixed problem with nested dynamic tables and Execute.
Revision Changes Path
1.171 +1 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- Changes.pod 2001/06/03 18:15:44 1.170
+++ Changes.pod 2001/06/04 18:57:45 1.171
@@ -23,6 +23,7 @@
- fixed problem with wrong setup of Content-Length header
when running in CGI mode, with escmode = 0. Spotted by
Edwin Ramirez.
+ - fixed problem with nested dynamic tables and Execute.
=head1 1.3.2 (RELEASE) 16 May. 2001
1.158 +42 -60 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- Embperl.pm 2001/06/03 18:15:45 1.157
+++ Embperl.pm 2001/06/04 18:57:45 1.158
@@ -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.157 2001/06/03 18:15:45 richter Exp $
+# $Id: Embperl.pm,v 1.158 2001/06/04 18:57:45 richter Exp $
#
###################################################################################
@@ -46,44 +46,18 @@
$cwd
- $escmode
- %fdat
- %udat
- %mdat
- @ffld
- %fsplitdat
- %idat
-
- $tabmode
- $escmode
- $row
- $cnt
- $col
- $maxrow
- $maxcol
-
$evalpackage
- $optRedirectStdout
- $optDisableFormData
- $optDisableVarCleanup
- $optAllowZeroFilesize
-
- $dbgShowCleanup
- $dbgLogLink
- $dbgForm
- $dbgSession
-
- $escmode
-
$SessionMgnt
$DefaultIDLength
- $req_rec
+ $pathsplit
- %http_headers_out
+ @AliasScalar
+ @AliasHash
+ @AliasArray
- $pathsplit
+ $dummy
) ;
@@ -247,8 +221,40 @@
'TAB:' => '#FF0080',
'INPU:' => '#008040',
) ;
+#######################################################################################
+
+BEGIN
+ {
+ @AliasScalar = qw{row col cnt maxrow maxcol tabmode escmode req_rec
+ dbgAll dbgAllCmds dbgCmd dbgDefEval dbgEarlyHttpHeader
+ dbgEnv dbgEval dbgFlushLog dbgFlushOutput dbgForm
+ dbgFunc dbgHeadersIn dbgImport dbgInput dbgLogLink
+ dbgMem dbgProfile dbgShowCleanup dbgSource dbgStd
+ dbgSession dbgTab dbgWatchScalar dbgParse dbgObjectSearch
+ optDisableChdir optDisableEmbperlErrorPage optReturnError optDisableFormData
+ optDisableHtmlScan optDisableInputScan optDisableMetaScan optDisableTableScan
+ optDisableSelectScan optDisableVarCleanup optEarlyHttpHeader optOpcodeMask
+ optRawInput optSafeNamespace optSendHttpHeader optAllFormData
+ optRedirectStdout optUndefToEmptyValue optNoHiddenEmptyValue optAllowZeroFilesize
+ optKeepSrcInMemory optKeepSpaces optOpenLogEarly optNoUncloseWarn
+ } ;
+ @AliasHash = qw{fdat udat mdat idat http_headers_out fsplitfdat} ;
+ @AliasArray = qw{ffld} ;
+ } ;
+
+use vars (map { "\$$_" } @AliasScalar) ;
+use vars (map { "\%$_" } @AliasHash) ;
+use vars (map { "\@$_" } @AliasArray) ;
+no strict ;
+foreach (@HTML::Embperl::AliasScalar)
+ {
+ $dummy = ${"HTML::Embperl\:\:$_"} ; # necessary to make sure variable exists!
+ $dummy = ${"HTML::Embperl\:\:$_"} ; # necessary to make sure variable exists!
+ }
+use strict ;
+
#######################################################################################
#
# tie for logfile output
@@ -658,7 +664,7 @@
my %cgienv = $req_rec->cgi_env ;
while (($k, $v) = each %cgienv)
{
- $ENV{$k} = $v ;
+ $ENV{$k} = $v if (!exists $ENV{$k}) ;
}
}
@@ -1637,11 +1643,6 @@
#######################################################################################
use strict ;
-use vars qw {
- @AliasScalar
- @AliasHash
- @AliasArray
- } ;
if (defined ($ENV{MOD_PERL}))
@@ -1831,23 +1832,6 @@
-#######################################################################################
-
-@AliasScalar = qw{row col cnt maxrow maxcol tabmode escmode req_rec
- dbgAll dbgAllCmds dbgCmd dbgDefEval dbgEarlyHttpHeader
- dbgEnv dbgEval dbgFlushLog dbgFlushOutput dbgForm
- dbgFunc dbgHeadersIn dbgImport dbgInput dbgLogLink
- dbgMem dbgProfile dbgShowCleanup dbgSource dbgStd
- dbgSession dbgTab dbgWatchScalar dbgParse dbgObjectSearch
- optDisableChdir optDisableEmbperlErrorPage optReturnError optDisableFormData
- optDisableHtmlScan optDisableInputScan optDisableMetaScan optDisableTableScan
- optDisableSelectScan optDisableVarCleanup optEarlyHttpHeader optOpcodeMask
- optRawInput optSafeNamespace optSendHttpHeader optAllFormData
- optRedirectStdout optUndefToEmptyValue optNoHiddenEmptyValue optAllowZeroFilesize
- optKeepSrcInMemory optKeepSpaces optOpenLogEarly optNoUncloseWarn
- } ;
-@AliasHash = qw{fdat udat mdat idat http_headers_out fsplitfdat} ;
-@AliasArray = qw{ffld} ;
#######################################################################################
@@ -1866,19 +1850,17 @@
if (!defined(${"$package\:\:row"}))
{ # create new aliases for Embperl magic vars
- foreach (@AliasScalar)
+ foreach (@HTML::Embperl::AliasScalar)
{
*{"$package\:\:$_"} = \${"HTML::Embperl\:\:$_"} ;
$dummy = ${"$package\:\:$_"} ; # necessary to make sure variable exists!
- $dummy = ${"HTML::Embperl\:\:$_"} ; # necessary to make sure variable exists!
- $dummy = ${"HTML::Embperl\:\:$_"} ; # necessary to make sure variable exists!
}
- foreach (@AliasHash)
+ foreach (@HTML::Embperl::AliasHash)
{
*{"$package\:\:$_"} = \%{"HTML::Embperl\:\:$_"} ;
}
- foreach (@AliasArray)
+ foreach (@HTML::Embperl::AliasArray)
{
*{"$package\:\:$_"} = \@{"HTML::Embperl\:\:$_"} ;
}
1.10 +2 -1 embperl/epmacro.h
Index: epmacro.h
===================================================================
RCS file: /home/cvs/embperl/epmacro.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- epmacro.h 2001/03/27 12:27:49 1.9
+++ epmacro.h 2001/06/04 18:57:45 1.10
@@ -30,7 +30,8 @@
{ \
\
sv_setiv (pSV, var) ; \
- used++ ; \
+ if (pCurrReq -> bReqRunning) \
+ used++ ; \
if ((pCurrReq -> bDebug & dbgTab) && pCurrReq -> bReqRunning) \
lprintf (pCurrReq, "[%d]TAB: get %s = %d, Used = %d\n", pCurrReq -> nPid, #name, var, used) ; \
return 0 ; \
1.105 +4 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- epmain.c 2001/06/03 18:15:45 1.104
+++ epmain.c 2001/06/04 18:57:45 1.105
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.104 2001/06/03 18:15:45 richter Exp $
+# $Id: epmain.c,v 1.105 2001/06/04 18:57:45 richter Exp $
#
###################################################################################*/
@@ -2231,7 +2231,7 @@
r -> bAppendToMainReq = FALSE ;
}
- r -> bReqRunning = 1 ;
+ r -> bReqRunning = 0 ;
r -> Buf.pFile = pFile ;
@@ -3492,6 +3492,8 @@
}
else
r -> bOptions |= optDisableChdir ;
+
+ r -> bReqRunning = 1 ;
if ((rc = ProcessFile (r, r -> Buf.pFile -> nFilesize)) != ok)
if (rc == rcExit)
1.4 +2 -2 embperl/epocgi.test.pl.templ
Index: epocgi.test.pl.templ
===================================================================
RCS file: /home/cvs/embperl/epocgi.test.pl.templ,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- epocgi.test.pl.templ 2001/06/03 18:15:45 1.3
+++ epocgi.test.pl.templ 2001/06/04 18:57:46 1.4
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epocgi.test.pl.templ,v 1.3 2001/06/03 18:15:45 richter Exp $
+# $Id: epocgi.test.pl.templ,v 1.4 2001/06/04 18:57:46 richter Exp $
#
###################################################################################
@@ -32,7 +32,7 @@
my $ioType ;
my %req ;
-
+
HTML::EmbperlObject::ScanEnvironment (\%req) ;
$req{'inputfile'} = $ENV{PATH_TRANSLATED} ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org