richter 01/12/11 01:03:52
Modified: . Tag: Embperl2c Embperl.pm Embperl.pod Embperl.xs
EmbperlD.pod epcache.c epprovider.c test.pl
Embperl/Recipe Tag: Embperl2c EmbperlXSLT.pm XSLT.pm
Embperl/Syntax Tag: Embperl2c POD.pm
driver Tag: Embperl2c eplibxslt.c epxalan.cpp
test/conf Tag: Embperl2c httpd.conf.src startup.pl
Log:
-
Revision Changes Path
No revision
No revision
1.118.4.67 +14 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.66
retrieving revision 1.118.4.67
diff -u -r1.118.4.66 -r1.118.4.67
--- Embperl.pm 2001/11/29 09:07:42 1.118.4.66
+++ Embperl.pm 2001/12/11 09:03:50 1.118.4.67
@@ -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.66 2001/11/29 09:07:42 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.67 2001/12/11 09:03:50 richter Exp $
#
###################################################################################
@@ -762,6 +762,19 @@
$req = { 'inputfile' => $fn, 'sub' => $sub, 'param' => \@parameter }
}
+ my $lastreq = CurrReq () ;
+ if ($lastreq)
+ { # inherent parameter of outer request
+ my $lastparam = $lastreq -> ReqParameter ;
+ if ($lastparam)
+ {
+ foreach (keys %$lastparam)
+ {
+ $req -> {$_} = $lastparam -> {$_} if (!exists ($req -> {$_})) ;
+ }
+ }
+ }
+
my $req_rec ;
if (defined ($$req{req_rec}))
{ $req_rec = $$req{'req_rec'} }
@@ -846,7 +859,6 @@
my $Inputfile = $$req{'inputfile'} || $$req{'isa'} || $$req{'object'} || '?'
;
my $Sub = $$req{'sub'} || '' ;
- my $lastreq = CurrReq () ;
my $pathndx = 0 ;
my $lastSyntaxName ;
1.56.4.13 +1 -1 embperl/Embperl.pod
Index: Embperl.pod
===================================================================
RCS file: /home/cvs/embperl/Embperl.pod,v
retrieving revision 1.56.4.12
retrieving revision 1.56.4.13
diff -u -r1.56.4.12 -r1.56.4.13
--- Embperl.pod 2001/11/02 11:34:25 1.56.4.12
+++ Embperl.pod 2001/12/11 09:03:50 1.56.4.13
@@ -1545,7 +1545,7 @@
This is the same as using the Apache function
- [- $req_rec ->� header_out("Language" => "DE"); -]
+ [- $req_rec ->�header_out("Language" => "DE"); -]
=item B<A>, B<EMBED>, B<IMG>, B<IFRAME>, B<FRAME>, B<LAYER>
1.29.4.27 +16 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.26
retrieving revision 1.29.4.27
diff -u -r1.29.4.26 -r1.29.4.27
--- Embperl.xs 2001/11/23 07:50:59 1.29.4.26
+++ Embperl.xs 2001/12/11 09:03:50 1.29.4.27
@@ -583,6 +583,22 @@
OUTPUT:
RETVAL
+
+SV *
+embperl_ReqParameter(r)
+ tReq * r
+CODE:
+ RETVAL = NULL;
+ if (r -> pConf)
+ {
+ if (r -> pConf -> pReqParameter)
+ RETVAL = newRV_inc((SV *)r -> pConf -> pReqParameter) ;
+ }
+OUTPUT:
+ RETVAL
+
+
+
int
embperl_Error(r,...)
tReq * r
1.29.4.12 +1 -1 embperl/EmbperlD.pod
Index: EmbperlD.pod
===================================================================
RCS file: /home/cvs/embperl/EmbperlD.pod,v
retrieving revision 1.29.4.11
retrieving revision 1.29.4.12
diff -u -r1.29.4.11 -r1.29.4.12
--- EmbperlD.pod 2001/11/02 11:34:25 1.29.4.11
+++ EmbperlD.pod 2001/12/11 09:03:50 1.29.4.12
@@ -874,7 +874,7 @@
my ($r, $in, $mtime) = @_ ;
open F, $r -> filename or return NOT_FOUND ;
- local $\ = undef ;
+ local $/ = undef ;
$$in = <F> ;
close F ;
1.1.2.17 +5 -2 embperl/Attic/epcache.c
Index: epcache.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcache.c,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- epcache.c 2001/11/27 09:35:58 1.1.2.16
+++ epcache.c 2001/12/11 09:03:50 1.1.2.17
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcache.c,v 1.1.2.16 2001/11/27 09:35:58 richter Exp $
+# $Id: epcache.c,v 1.1.2.17 2001/12/11 09:03:50 richter Exp $
#
###################################################################################*/
@@ -226,7 +226,7 @@
{
if (exfn)
{
- lprintf (r, "exfn=%s\n", exfn) ;
+ /* lprintf (r, "exfn=%s\n", exfn) ; */
free ((void *)pNew -> sExpiresFilename) ;
pNew -> sExpiresFilename = exfn ;
}
@@ -283,6 +283,9 @@
cache_free (r, pNew) ;
return rc ;
}
+ if (pProviderClass -> fUpdateParam)
+ if ((rc = (*pProviderClass -> fUpdateParam)(r, pNew -> pProvider,
pProviderParam)) != ok)
+ return rc ;
}
if (r -> bDebug & dbgCache)
lprintf (r, "[%d]CACHE: Created new CacheItem %s; expires_in=%d
expires_func=%s expires_filename=%s cache=%s\n",
1.1.2.16 +3 -1 embperl/Attic/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epprovider.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- epprovider.c 2001/11/27 09:35:58 1.1.2.15
+++ epprovider.c 2001/12/11 09:03:50 1.1.2.16
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epprovider.c,v 1.1.2.15 2001/11/27 09:35:58 richter Exp $
+# $Id: epprovider.c,v 1.1.2.16 2001/12/11 09:03:50 richter Exp $
#
###################################################################################*/
@@ -514,6 +514,7 @@
pNew = (tProviderMem *)pItem -> pProvider ;
pNew -> sName = GetHashValueStrDup (pParam, "name", NULL) ;
+ /*
pNew -> nLastModified = GetHashValueUInt (pParam, "mtime", 0) ;
pSrc = GetHashValueSV (pParam, "source") ;
@@ -523,6 +524,7 @@
pNew -> pSource = SvREFCNT_inc (SvRV(pSrc)) ;
else
pNew -> pSource = SvREFCNT_inc (pSrc) ;
+ */
return ok ;
}
1.70.4.103 +21 -21 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.102
retrieving revision 1.70.4.103
diff -u -r1.70.4.102 -r1.70.4.103
--- test.pl 2001/11/29 07:32:40 1.70.4.102
+++ test.pl 2001/12/11 09:03:50 1.70.4.103
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.102 2001/11/29 07:32:40 richter Exp $
+# $Id: test.pl,v 1.70.4.103 2001/12/11 09:03:50 richter Exp $
#
###################################################################################
@@ -47,6 +47,7 @@
},
'nooutput.htm' => {
repeat => 2,
+ version => 2,
},
'plain.htm' => {
repeat => 3,
@@ -58,13 +59,11 @@
'repeat' => 3,
'errors' => 8,
'version' => 1,
- 'noloop' => 1, # Perl leaks on eval syntax error
},
'error.htm' => {
'repeat' => 3,
'errors' => 6,
'version' => 2,
- 'noloop' => 1, # Perl leaks on eval syntax error
},
'errormismatch.htm' => {
'errors' => '1',
@@ -103,7 +102,6 @@
'errors' => 6,
'version' => 2,
'cgi' => 0,
- 'noloop' => 1, # Perl leaks on eval syntax error
},
'errdoc/epl/errdoc2.htm' => {
'option' => '262144',
@@ -117,7 +115,7 @@
'errors' => 6,
'version' => 2,
'cgi' => 0,
- 'noloop' => 1, # Perl leaks on eval syntax error
+ 'noloop' => 1,
},
'rawinput/rawinput.htm' => {
'option' => '16',
@@ -130,18 +128,20 @@
'condition' => '$] < 5.006000',
offline => 1,
},
-# 'varerr.htm' => {
-# 'errors' => 8,
-# 'noloop' => 1,
-# 'condition' => '$] < 5.006000',
-# cgi => 1,
-# },
-# 'varerr.htm' => {
-# 'errors' => 8,
-# 'noloop' => 1,
-# 'condition' => '$] < 5.006000',
-# modperl => 1,
-# },
+ 'varerr.htm' => {
+ 'errors' => -1,
+ 'noloop' => 1,
+ 'condition' => '$] < 5.006000',
+ cgi => 1,
+ 'version' => 1,
+ },
+ 'varerr.htm' => {
+ 'errors' => -1,
+ 'noloop' => 1,
+ 'condition' => '$] < 5.006000',
+ modperl => 1,
+ 'version' => 1,
+ },
'varerr.htm' => {
'errors' => 7,
'noloop' => 1,
@@ -155,7 +155,6 @@
'condition' => '$] >= 5.006000',
'cmpext' => '56',
'version' => 2,
- 'noloop' => 1, # Perl leaks on eval syntax error
},
'varerr.htm' => {
'errors' => 2,
@@ -318,8 +317,9 @@
},
'importmodule.htm' => {
},
-# 'recursexec.htm' => {
-# },
+ 'recursexec.htm' => {
+ 'version' => 1,
+ },
'nph/div.htm' => {
'option' => '64',
},
@@ -941,7 +941,7 @@
print "\nloading... ";
- $defaultdebug = 0xffffdffd ;
+ $defaultdebug = 0x7fffdffd ;
#$defaultdebug = 1 ;
#### setup paths #####
No revision
No revision
1.1.2.5 +7 -1 embperl/Embperl/Recipe/Attic/EmbperlXSLT.pm
Index: EmbperlXSLT.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/EmbperlXSLT.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- EmbperlXSLT.pm 2001/11/27 08:37:56 1.1.2.4
+++ EmbperlXSLT.pm 2001/12/11 09:03:51 1.1.2.5
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlXSLT.pm,v 1.1.2.4 2001/11/27 08:37:56 richter Exp $
+# $Id: EmbperlXSLT.pm,v 1.1.2.5 2001/12/11 09:03:51 richter Exp $
#
###################################################################################
@@ -38,8 +38,14 @@
my ($class, $r, $recipe, $param) = @_ ;
my $ep = HTML::Embperl::Recipe::Embperl -> new ($r, $recipe, $param) ;
+ return $ep if ($r -> IsImport) ;
+
my $xsltproc = $param -> {xsltproc} ;
my $xsltparam= $param -> {xsltparam} || \%HTML::Embperl::fdat ;
+
+ use Data::Dumper ;
+ print HTML::Embperl::LOG 'xsltparam = ', Dumper ($xsltparam) ;
+
my $self =
{
1.1.2.5 +2 -1 embperl/Embperl/Recipe/Attic/XSLT.pm
Index: XSLT.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/XSLT.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XSLT.pm 2001/11/27 08:37:56 1.1.2.4
+++ XSLT.pm 2001/12/11 09:03:51 1.1.2.5
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: XSLT.pm,v 1.1.2.4 2001/11/27 08:37:56 richter Exp $
+# $Id: XSLT.pm,v 1.1.2.5 2001/12/11 09:03:51 richter Exp $
#
###################################################################################
@@ -72,6 +72,7 @@
} ;
}
+ return $src if ($r -> IsImport) ;
$self =
{
No revision
No revision
1.1.2.7 +2 -2 embperl/Embperl/Syntax/Attic/POD.pm
Index: POD.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/POD.pm,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- POD.pm 2001/11/29 09:07:44 1.1.2.6
+++ POD.pm 2001/12/11 09:03:52 1.1.2.7
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: POD.pm,v 1.1.2.6 2001/11/29 09:07:44 richter Exp $
+# $Id: POD.pm,v 1.1.2.7 2001/12/11 09:03:52 richter Exp $
#
###################################################################################
@@ -261,7 +261,7 @@
%CDATA =
(
- 'verbatim' =>
+ 'verbatim2' =>
{
'text' => " ",
'end' => $paraend,
No revision
No revision
1.1.2.11 +13 -10 embperl/driver/Attic/eplibxslt.c
Index: eplibxslt.c
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/eplibxslt.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- eplibxslt.c 2001/11/27 08:37:56 1.1.2.10
+++ eplibxslt.c 2001/12/11 09:03:52 1.1.2.11
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eplibxslt.c,v 1.1.2.10 2001/11/27 08:37:56 richter Exp $
+# $Id: eplibxslt.c,v 1.1.2.11 2001/12/11 09:03:52 richter Exp $
#
###################################################################################*/
@@ -804,26 +804,28 @@
if (pParamHV)
{
- n = 0 ;
- hv_iterinit (pParamHV) ;
- while ((pEntry = hv_iternext (pParamHV)))
- {
- n++ ;
- }
-
+ n = hv_iterinit (pParamHV) ;
+ lprintf (r, "libxslt param number %d\n", n) ;
if (!(pParamArray = malloc(sizeof (const char *) * (n + 1) * 2)))
return rcOutOfMemory ;
+ lprintf (r, "libxslt param number %d\n", n) ;
n = 0 ;
- hv_iterinit (pParamHV) ;
while ((pEntry = hv_iternext (pParamHV)))
{
+ lprintf (r, "libxslt param 2 number %d\n", n) ;
pKey = hv_iterkey (pEntry, &l) ;
+ lprintf (r, "libxslt param 3 number %d\n", n) ;
pValue = hv_iterval (pParamHV, pEntry) ;
+ lprintf (r, "libxslt param 4 number %d\n", n) ;
pParamArray[n++] = pKey ;
+ lprintf (r, "libxslt param 5 number %d\n", n) ;
pParamArray[n++] = SvPV (pValue, len) ;
+ lprintf (r, "libxslt param 6 number %d\n", n) ;
+ lprintf (r, "libxslt param input %s = %s\n", pParamArray[n-2],
pParamArray[n-1]) ;
}
pParamArray[n++] = NULL ;
+ lprintf (r, "libxslt param 99 number %d\n", n) ;
((tProviderLibXSLT *)pProvider) -> pParamArray = pParamArray ;
}
return ok ;
@@ -942,12 +944,13 @@
pProvider -> pOutputSV = NULL ;
}
+ /*
if (pProvider -> pParamArray)
{
free (pProvider -> pParamArray) ;
pProvider -> pParamArray = NULL ;
}
-
+ */
return ok ;
}
1.1.2.14 +4 -8 embperl/driver/Attic/epxalan.cpp
Index: epxalan.cpp
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/epxalan.cpp,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- epxalan.cpp 2001/11/27 08:37:56 1.1.2.13
+++ epxalan.cpp 2001/12/11 09:03:52 1.1.2.14
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epxalan.cpp,v 1.1.2.13 2001/11/27 08:37:56 richter Exp $
+# $Id: epxalan.cpp,v 1.1.2.14 2001/12/11 09:03:52 richter Exp $
#
###################################################################################*/
@@ -585,18 +585,12 @@
return rcNotHashRef ;
}
- n = 0 ;
- hv_iterinit (pParam) ;
- while ((pEntry = hv_iternext (pParam)))
- {
- n++ ;
- }
+ n = hv_iterinit (pParam) ;
if (!(pParamArray = (const char * *)_malloc(r, sizeof (const char *) * (n + 1)
* 2)))
return rcOutOfMemory ;
n = 0 ;
- hv_iterinit (pParam) ;
while ((pEntry = hv_iternext (pParam)))
{
pKey = hv_iterkey (pEntry, &l) ;
@@ -982,10 +976,12 @@
pProvider -> pOutputSV = NULL ;
+ /*
if (pProvider -> pParamHV)
SvREFCNT_dec (pProvider -> pParamHV) ;
pProvider -> pParamHV = NULL ;
+ */
return ok ;
}
No revision
No revision
1.24.4.30 +2 -0 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.24.4.29
retrieving revision 1.24.4.30
diff -u -r1.24.4.29 -r1.24.4.30
--- httpd.conf.src 2001/11/29 09:07:44 1.24.4.29
+++ httpd.conf.src 2001/12/11 09:03:52 1.24.4.30
@@ -480,6 +480,8 @@
<Location /eg/web>
+SetEnv EMBPERL_RECIPE EmbperlWeb
+SetEnv EMBPERL_ALLOW .
PerlSetEnv EMBPERL_OBJECT_BASE base.htm
PerlSetEnv EMBPERL_OBJECT_STOPDIR \"$EPPATH/eg/web\"
PerlSetEnv EMBPERL_FILESMATCH \"\\.htm.?\$|\\.epl\$|\\.xml\$|\\.pod\$\"
1.9.6.5 +3 -0 embperl/test/conf/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup.pl,v
retrieving revision 1.9.6.4
retrieving revision 1.9.6.5
diff -u -r1.9.6.4 -r1.9.6.5
--- startup.pl 2001/05/16 06:45:26 1.9.6.4
+++ startup.pl 2001/12/11 09:03:52 1.9.6.5
@@ -32,4 +32,7 @@
$testshare = "Shared Data" ;
$cp -> share ('$testshare') ;
+
+require "$ENV{EMBPERL_SRC}/eg/webutil/EmbperlWebRecipe.pm" ;
+
1 ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
