richter 01/12/19 00:32:49
Modified: . Tag: Embperl2c Embperl.pm Embperl.xs epmain.c
Log:
app object
Revision Changes Path
No revision
No revision
1.118.4.72 +5 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.71
retrieving revision 1.118.4.72
diff -u -r1.118.4.71 -r1.118.4.72
--- Embperl.pm 2001/12/17 15:37:41 1.118.4.71
+++ Embperl.pm 2001/12/19 08:32:48 1.118.4.72
@@ -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.118.4.71 2001/12/17 15:37:41 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.72 2001/12/19 08:32:48 richter Exp $
#
###################################################################################
@@ -799,7 +799,9 @@
}
else
{
+ print LOG "[$$]FORM: setup 1****\n" ;
GetInputData_CGIScript () ;
+ print LOG "[$$]FORM: setup 2 ****\n" ;
foreach ( @ffld )
{
print LOG "[$$]FORM: $_=$fdat{$_}\n" ;
@@ -844,7 +846,8 @@
{
foreach (keys %$lastparam)
{
- next if ($_ eq 'import' || $_ eq 'object' || $_ eq 'isa' || $_ eq
'provider' || $_ eq 'param') ;
+ next if ($_ eq 'import' || $_ eq 'object' || $_ eq 'isa' || $_ eq
'provider'
+ || $_ eq 'param' || $_ eq 'input' || $_ eq 'output' ||
$_ eq 'application') ;
$req -> {$_} = $lastparam -> {$_} if (!exists ($req -> {$_})) ;
}
}
1.29.4.31 +3 -3 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.30
retrieving revision 1.29.4.31
diff -u -r1.29.4.30 -r1.29.4.31
--- Embperl.xs 2001/12/17 15:37:41 1.29.4.30
+++ Embperl.xs 2001/12/19 08:32:48 1.29.4.31
@@ -629,9 +629,9 @@
{
r -> pApplication = app ;
SvREFCNT_inc (app) ;
- if (RETVAL)
- SvREFCNT_dec (RETVAL) ;
- }
+ }
+ else if (RETVAL)
+ SvREFCNT_inc (RETVAL) ;
OUTPUT:
RETVAL
1.75.4.78 +10 -3 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.77
retrieving revision 1.75.4.78
diff -u -r1.75.4.77 -r1.75.4.78
--- epmain.c 2001/12/17 15:37:41 1.75.4.77
+++ epmain.c 2001/12/19 08:32:48 1.75.4.78
@@ -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.75.4.77 2001/12/17 15:37:41 richter Exp $
+# $Id: epmain.c,v 1.75.4.78 2001/12/19 08:32:48 richter Exp $
#
###################################################################################*/
@@ -719,6 +719,7 @@
EPENTRY (GetInputData_CGIScript) ;
+ lprintf (r, "****get fh setup = %d sub req = %d imp = %d\n", r ->
bIsFormHashSetup, r -> bSubReq, r -> pImportStash) ;
if (r -> bIsFormHashSetup)
return ok ;
@@ -2444,8 +2445,10 @@
/*r -> nIOType = InitialReq.nIOType ;*/
if (r -> pApplication)
+ {
SvREFCNT_inc (r -> pApplication) ;
-
+ }
+
r -> sSubName = sSubName ;
r -> nSessionMgnt = nSessionMgnt ;
r -> pConf = pConf ;
@@ -2612,6 +2615,8 @@
if (r -> pApplication)
SvREFCNT_dec (r -> pApplication) ;
+ lprintf (r, "****free fh setup = %d sub req = %d imp = %d\n", r ->
bIsFormHashSetup, r -> bSubReq, r -> pImportStash) ;
+
if (r -> bSubReq)
{
tReq * l = r -> pLastReq ;
@@ -2640,10 +2645,12 @@
hv_clear (r -> pInputHash) ;
if (!r -> pImportStash)
{
+ tReq * l = r -> pLastReq ;
av_clear (r -> pFormArray) ;
hv_clear (r -> pFormHash) ;
hv_clear (r -> pFormSplitHash) ;
- r -> bIsFormHashSetup = 0 ;
+ if (l)
+ l -> bIsFormHashSetup = 0 ;
}
#ifdef EP2
av_clear (r -> pDomTreeAV) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
