richter 02/01/29 08:02:52
Modified: . Tag: Embperl2c epapinit.c epdat2.h epinit.c
eputil.c
Embperl Tag: Embperl2c Object.pm
driver Tag: Embperl2c eplibxslt.c
test/conf Tag: Embperl2c httpd.conf.src
test/html/EmbperlObject Tag: Embperl2c epodiv.htm
Log:
-
Revision Changes Path
No revision
No revision
1.1.2.13 +14 -9 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- epapinit.c 28 Jan 2002 20:28:34 -0000 1.1.2.12
+++ epapinit.c 29 Jan 2002 16:02:51 -0000 1.1.2.13
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epapinit.c,v 1.1.2.12 2002/01/28 20:28:34 richter Exp $
+# $Id: epapinit.c,v 1.1.2.13 2002/01/29 16:02:51 richter Exp $
#
###################################################################################*/
@@ -140,7 +140,8 @@
embperl_DefaultReqConfig (&cfg -> ReqConfig) ;
embperl_DefaultAppConfig (&cfg -> AppConfig) ;
embperl_DefaultComponentConfig (&cfg -> ComponentConfig) ;
- cfg -> bUseEnv = -1 ;
+ /*cfg -> bUseEnv = -1 ; */
+ cfg -> bUseEnv = 1 ;
return cfg;
}
@@ -155,7 +156,8 @@
embperl_DefaultReqConfig (&cfg -> ReqConfig) ;
embperl_DefaultAppConfig (&cfg -> AppConfig) ;
embperl_DefaultComponentConfig (&cfg -> ComponentConfig) ;
- cfg -> bUseEnv = -1 ;
+ /*cfg -> bUseEnv = -1 ; */
+ cfg -> bUseEnv = 1 ;
return cfg;
}
@@ -175,13 +177,16 @@
{
*ppConfig = NULL ;
- if(r && r->per_dir_config)
+ if (embperl_module.module_index >= 0)
{
- *ppConfig = (tApacheDirConfig *) get_module_config(r->per_dir_config,
&embperl_module);
- }
- else if(s && s->module_config)
- {
- *ppConfig = (tApacheDirConfig *) get_module_config(s->module_config,
&embperl_module);
+ if(r && r->per_dir_config)
+ {
+ *ppConfig = (tApacheDirConfig *) get_module_config(r->per_dir_config,
&embperl_module);
+ }
+ else if(s && s->module_config)
+ {
+ *ppConfig = (tApacheDirConfig *) get_module_config(s->module_config,
&embperl_module);
+ }
}
return ok ;
}
1.1.2.20 +3 -3 embperl/Attic/epdat2.h
Index: epdat2.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdat2.h,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- epdat2.h 29 Jan 2002 09:13:46 -0000 1.1.2.19
+++ epdat2.h 29 Jan 2002 16:02:51 -0000 1.1.2.20
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdat2.h,v 1.1.2.19 2002/01/29 09:13:46 richter Exp $
+# $Id: epdat2.h,v 1.1.2.20 2002/01/29 16:02:51 richter Exp $
#
###################################################################################*/
@@ -223,7 +223,7 @@
-typedef struct tComponent
+struct tComponent
{
SV * _perlsv ; /**< The perl reference to this structure */
tMemPool * pPool ; /**< pool for memorymanagement */
@@ -312,7 +312,7 @@
SV * pCodeSV ; /* contains currently compiled line */
- } tComponent ;
+ } ;
1.1.2.23 +4 -4 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- epinit.c 29 Jan 2002 09:13:46 -0000 1.1.2.22
+++ epinit.c 29 Jan 2002 16:02:51 -0000 1.1.2.23
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epinit.c,v 1.1.2.22 2002/01/29 09:13:46 richter Exp $
+# $Id: epinit.c,v 1.1.2.23 2002/01/29 16:02:51 richter Exp $
#
###################################################################################*/
@@ -485,7 +485,7 @@
{
server_rec * ap_s = (server_rec *)SvIV((SV*)SvRV(pApacheSrvSV));
- embperl_ApacheAddModule () ;
+ embperl_ApacheAddModule () ;
embperl_GetApacheConfig (pThread, NULL, ap_s, &pApacheCfg) ;
}
#endif
@@ -958,8 +958,8 @@
pApp -> pCurrReq = r ;
sv_setsv(pThread -> pReqRV, r -> _perlsv) ;
- r -> sInitialCWD = ep_palloc(pPool, MAX_PATH * 2) ;
- getcwd (r -> sInitialCWD, MAX_PATH * 2 - 1) ;
+ r -> sInitialCWD = ep_palloc(pPool, PATH_MAX * 2) ;
+ getcwd (r -> sInitialCWD, PATH_MAX * 2 - 1) ;
*ppReq = r ;
1.15.4.37 +3 -3 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.15.4.36
retrieving revision 1.15.4.37
diff -u -r1.15.4.36 -r1.15.4.37
--- eputil.c 29 Jan 2002 09:13:46 -0000 1.15.4.36
+++ eputil.c 29 Jan 2002 16:02:51 -0000 1.15.4.37
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eputil.c,v 1.15.4.36 2002/01/29 09:13:46 richter Exp $
+# $Id: eputil.c,v 1.15.4.37 2002/01/29 16:02:51 richter Exp $
#
###################################################################################*/
@@ -1442,7 +1442,7 @@
) \
)
#else
-#define isAbsPath(sFilename) (!(sFilename[0] == '/'))
+#define isAbsPath(sFilename) (sFilename[0] == '/')
#endif
/* ---------------------------------------------------------------------------- */
@@ -1559,7 +1559,7 @@
if (stat (fn, &st) == 0)
{
r -> Component.nPathNdx = i ;
- return embperl_File2Abs (r, pPool, sFilename) ;
+ return embperl_File2Abs (r, pPool, fn) ;
}
}
No revision
No revision
1.1.2.4 +5 -4 embperl/Embperl/Attic/Object.pm
Index: Object.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Object.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Object.pm 29 Jan 2002 09:13:47 -0000 1.1.2.3
+++ Object.pm 29 Jan 2002 16:02:52 -0000 1.1.2.4
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Object.pm,v 1.1.2.3 2002/01/29 09:13:47 richter Exp $
+# $Id: Object.pm,v 1.1.2.4 2002/01/29 16:02:52 richter Exp $
#
###################################################################################
@@ -113,10 +113,11 @@
$req -> {object_base} = $ENV{EMBPERL_OBJECT_BASE} || '_base.html' ;
$req -> {object_app} = $ENV{EMBPERL_OBJECT_APP} if (exists
($ENV{EMBPERL_OBJECT_APP})) ;
- $req -> {object_addpath} = $ENV{EMBPERL_OBJECT_ADDPATH} if (exists
($ENV{EMBPERL_OBJECT_ADDPATH})) ;
+ $req -> {object_addpath} = [split (/;/, $ENV{EMBPERL_OBJECT_ADDPATH})]
if (exists ($ENV{EMBPERL_OBJECT_ADDPATH})) ;
$req -> {object_stopdir} = $ENV{EMBPERL_OBJECT_STOPDIR} if (exists
($ENV{EMBPERL_OBJECT_STOPDIR})) ;
$req -> {object_fallback} = $ENV{EMBPERL_OBJECT_FALLBACK} if (exists
($ENV{EMBPERL_OBJECT_FALLBACK})) ;
$req -> {object_handler_class} = $ENV{EMBPERL_OBJECT_HANDLER_CLASS} if (exists
($ENV{EMBPERL_OBJECT_HANDLER_CLASS})) ;
+ $req -> {debug} = 0x7fffffff ;
}
@@ -146,7 +147,7 @@
$req{'inputfile'} = $filename ;
$req{'object_base_modifier'} = $mod ;
$req{'uri'} = $r -> Apache::uri ;
- $req{'cleanup'} = -1 if (($req{'options'} &
Embperl::Constant::optDisableVarCleanup)) ;
+ #$req{'cleanup'} = -1 if (($req{'options'} &
Embperl::Constant::optDisableVarCleanup)) ;
$req{'options'} |= Embperl::Constant::optSendHttpHeader ;
$req{'req_rec'} = $r ;
@@ -191,7 +192,7 @@
my $directory ;
my $rootdir = $apr?norm_path ($apr -> document_root, $cwd):"$volume/" ;
my $stopdir = norm_path ($req -> {object_stopdir}, $cwd) ;
- my $debug = $req -> {debug} & Embperl::Constant::dbgObjectSearch ;
+ my $debug = 1 ; # $r -> {debug} & Embperl::Constant::dbgObjectSearch ;
if (-d $filename)
{
No revision
No revision
1.1.2.13 +78 -60 embperl/driver/Attic/eplibxslt.c
Index: eplibxslt.c
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/eplibxslt.c,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- eplibxslt.c 18 Jan 2002 16:22:38 -0000 1.1.2.12
+++ eplibxslt.c 29 Jan 2002 16:02:52 -0000 1.1.2.13
@@ -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.12 2002/01/18 16:22:38 richter Exp $
+# $Id: eplibxslt.c,v 1.1.2.13 2002/01/29 16:02:52 richter Exp $
#
###################################################################################*/
@@ -276,6 +276,7 @@
* @param r Embperl request record
* @param pProvider The provider record
* @param pData Returns the content
+* @param bUseCache Set if the content should not recomputed
* @return error code
* \endif
*
@@ -286,6 +287,7 @@
* @param r Embperl request record
* @param pProvider The provider record
* @param pData Liefert den Inhalt
+* @param bUseCache Gesetzt wenn der Inhalt nicht neu berechnet werden soll
* @return Fehlercode
* \endif
*
@@ -295,7 +297,8 @@
static int ProviderLibXSLTXSL_GetContentPtr (/*in*/ req * r,
/*in*/ tProvider * pProvider,
- /*in*/ void * * pData)
+ /*in*/ void * * pData,
+ /*in*/ bool bUseCache)
{
int rc ;
@@ -306,34 +309,37 @@
xmlDocPtr doc ;
tCacheItem * pFileCache = Cache_GetDependency(r, pProvider -> pCache, 0) ;
- if ((rc = Cache_GetContentSV (r, pFileCache, &pSource)) != ok)
+ if ((rc = Cache_GetContentSV (r, pFileCache, &pSource, bUseCache)) != ok)
return rc ;
- p = SvPV (pSource, len) ;
+ if (!bUseCache)
+ {
+ p = SvPV (pSource, len) ;
- if (p == NULL || len == 0)
- {
- strncpy (r -> errdat1, "LibXSLT XML stylesheet", sizeof (r -> errdat1)) ;
- return rcMissingInput ;
- }
+ if (p == NULL || len == 0)
+ {
+ strncpy (r -> errdat1, "LibXSLT XML stylesheet", sizeof (r -> errdat1)) ;
+ return rcMissingInput ;
+ }
- if ((doc = xmlParseMemory(p, len)) == NULL)
- {
- Cache_ReleaseContent (r, pFileCache) ;
- strncpy (r -> errdat1, "XSL parse", sizeof (r -> errdat1)) ;
- return rcLibXSLTError ;
- }
- ;
-
- if ((cur = xsltParseStylesheetDoc(doc)) == NULL)
- {
- xmlFreeDoc(doc) ;
- Cache_ReleaseContent (r, pFileCache) ;
- strncpy (r -> errdat1, "XSL compile", sizeof (r -> errdat1)) ;
- return rcLibXSLTError ;
- }
+ if ((doc = xmlParseMemory(p, len)) == NULL)
+ {
+ Cache_ReleaseContent (r, pFileCache) ;
+ strncpy (r -> errdat1, "XSL parse", sizeof (r -> errdat1)) ;
+ return rcLibXSLTError ;
+ }
+ ;
+
+ if ((cur = xsltParseStylesheetDoc(doc)) == NULL)
+ {
+ xmlFreeDoc(doc) ;
+ Cache_ReleaseContent (r, pFileCache) ;
+ strncpy (r -> errdat1, "XSL compile", sizeof (r -> errdat1)) ;
+ return rcLibXSLTError ;
+ }
- *pData = (void *)cur ;
+ *pData = (void *)cur ;
+ }
return ok ;
}
@@ -510,6 +516,7 @@
* @param r Embperl request record
* @param pProvider The provider record
* @param pData Returns the content
+* @param bUseCache Set if the content should not recomputed
* @return error code
* \endif
*
@@ -520,6 +527,7 @@
* @param r Embperl request record
* @param pProvider The provider record
* @param pData Liefert den Inhalt
+* @param bUseCache Gesetzt wenn der Inhalt nicht neu berechnet werden soll
* @return Fehlercode
* \endif
*
@@ -529,7 +537,8 @@
static int ProviderLibXSLTXML_GetContentPtr (/*in*/ req * r,
/*in*/ tProvider * pProvider,
- /*in*/ void * * pData)
+ /*in*/ void * * pData,
+ /*in*/ bool bUseCache)
{
int rc ;
@@ -539,25 +548,28 @@
xmlDocPtr doc ;
tCacheItem * pFileCache = Cache_GetDependency(r, pProvider -> pCache, 0) ;
- if ((rc = Cache_GetContentSV (r, pFileCache, &pSource)) != ok)
+ if ((rc = Cache_GetContentSV (r, pFileCache, &pSource, bUseCache)) != ok)
return rc ;
- p = SvPV (pSource, len) ;
+ if (!bUseCache)
+ {
+ p = SvPV (pSource, len) ;
- if (p == NULL || len == 0)
- {
- strncpy (r -> errdat1, "LibXSLT XML source", sizeof (r -> errdat1)) ;
- return rcMissingInput ;
- }
+ if (p == NULL || len == 0)
+ {
+ strncpy (r -> errdat1, "LibXSLT XML source", sizeof (r -> errdat1)) ;
+ return rcMissingInput ;
+ }
- if ((doc = xmlParseMemory(p, len)) == NULL)
- {
- Cache_ReleaseContent (r, pFileCache) ;
- strncpy (r -> errdat1, "XML parse", sizeof (r -> errdat1)) ;
- return rcLibXSLTError ;
- }
+ if ((doc = xmlParseMemory(p, len)) == NULL)
+ {
+ Cache_ReleaseContent (r, pFileCache) ;
+ strncpy (r -> errdat1, "XML parse", sizeof (r -> errdat1)) ;
+ return rcLibXSLTError ;
+ }
- *pData = (void *)doc ;
+ *pData = (void *)doc ;
+ }
return ok ;
}
@@ -844,6 +856,7 @@
* @param r Embperl request record
* @param pProvider The provider record
* @param pData Returns the content
+* @param bUseCache Set if the content should not recomputed
* @return error code
* \endif
*
@@ -854,6 +867,7 @@
* @param r Embperl request record
* @param pProvider The provider record
* @param pData Liefert den Inhalt
+* @param bUseCache Gesetzt wenn der Inhalt nicht neu berechnet werden soll
* @return Fehlercode
* \endif
*
@@ -861,9 +875,10 @@
-static int ProviderLibXSLT_GetContentSV (/*in*/ req * r,
- /*in*/ tProvider * pProvider,
- /*in*/ SV * * pData)
+static int ProviderLibXSLT_GetContentSV (/*in*/ req * r,
+ /*in*/ tProvider * pProvider,
+ /*in*/ SV * * pData,
+ /*in*/ bool bUseCache)
{
int rc ;
@@ -876,33 +891,36 @@
tCacheItem * pSrcCache = Cache_GetDependency(r, pProvider -> pCache, 0) ;
tCacheItem * pXSLCache = Cache_GetDependency(r, pProvider -> pCache, 1) ;
- if ((rc = Cache_GetContentPtr (r, pSrcCache, (void * *)&doc)) != ok)
+ if ((rc = Cache_GetContentPtr (r, pSrcCache, (void * *)&doc, bUseCache)) != ok)
return rc ;
- if ((rc = Cache_GetContentPtr (r, pXSLCache, (void * *)&cur)) != ok)
+ if ((rc = Cache_GetContentPtr (r, pXSLCache, (void * *)&cur, bUseCache)) != ok)
return rc ;
- if (((tProviderLibXSLT *)pProvider) -> pOutputSV)
- SvREFCNT_dec (((tProviderLibXSLT *)pProvider) -> pOutputSV) ;
+ if (!bUseCache)
+ {
+ if (((tProviderLibXSLT *)pProvider) -> pOutputSV)
+ SvREFCNT_dec (((tProviderLibXSLT *)pProvider) -> pOutputSV) ;
- ((tProviderLibXSLT *)pProvider) -> pOutputSV = newSVpv("", 0) ;
+ ((tProviderLibXSLT *)pProvider) -> pOutputSV = newSVpv("", 0) ;
- res = xsltApplyStylesheet(cur, doc, ((tProviderLibXSLT *)pProvider) ->
pParamArray);
- if(res == NULL)
- {
- strncpy (r -> errdat1, "XSLT", sizeof (r -> errdat1)) ;
- return rcLibXSLTError ;
- }
+ res = xsltApplyStylesheet(cur, doc, ((tProviderLibXSLT *)pProvider) ->
pParamArray);
+ if(res == NULL)
+ {
+ strncpy (r -> errdat1, "XSLT", sizeof (r -> errdat1)) ;
+ return rcLibXSLTError ;
+ }
- obuf = xmlOutputBufferCreateIO (ProviderLibXSLT_iowrite, NULL, pProvider, NULL)
;
+ obuf = xmlOutputBufferCreateIO (ProviderLibXSLT_iowrite, NULL, pProvider,
NULL) ;
- xsltSaveResultTo(obuf, res, cur);
+ xsltSaveResultTo(obuf, res, cur);
- xmlFreeDoc(res);
- xmlOutputBufferClose (obuf) ;
+ xmlFreeDoc(res);
+ xmlOutputBufferClose (obuf) ;
- *pData = ((tProviderLibXSLT *)pProvider) -> pOutputSV ;
- SvREFCNT_inc(*pData) ;
+ *pData = ((tProviderLibXSLT *)pProvider) -> pOutputSV ;
+ SvREFCNT_inc(*pData) ;
+ }
return ok ;
}
No revision
No revision
1.24.4.33 +5 -5 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.32
retrieving revision 1.24.4.33
diff -u -r1.24.4.32 -r1.24.4.33
--- httpd.conf.src 28 Jan 2002 20:28:35 -0000 1.24.4.32
+++ httpd.conf.src 29 Jan 2002 16:02:52 -0000 1.24.4.33
@@ -126,7 +126,7 @@
PerlScript \"$EPPATH/test/conf/$EPSTARTUP\"
-Embperl_UseEnv on
+#Embperl_UseEnv on
<Location /embperl/log>
@@ -449,7 +449,7 @@
PerlSetEnv EMBPERL_OBJECT_FALLBACK epofallback.htm
PerlSetEnv EMBPERL_FILESMATCH \"\\.htm.?\$|\\.epl\$\"
SetHandler perl-script
-PerlHandler EmbperlObject
+PerlHandler Embperl::Object
Options ExecCGI
</Location>
@@ -460,7 +460,7 @@
PerlSetEnv EMBPERL_OBJECT_FALLBACK epofallback.htm
PerlSetEnv EMBPERL_FILESMATCH \"\\.htm.?\$|\\.epl\$\"
SetHandler perl-script
-PerlHandler EmbperlObject
+PerlHandler Embperl::Object
Options ExecCGI
</Location>
@@ -469,7 +469,7 @@
PerlSetEnv EMBPERL_OBJECT_FALLBACK epofallback.htm
PerlSetEnv EMBPERL_FILESMATCH \"\\.htm.?\$|\\.epl\$\"
SetHandler perl-script
-PerlHandler EmbperlObject
+PerlHandler Embperl::Object
Options ExecCGI
</Location>
@@ -542,7 +542,7 @@
SetHandler perl-script
-PerlHandler EmbperlObject
+PerlHandler Embperl::Object
Options ExecCGI
No revision
No revision
1.1.4.3 +2 -2 embperl/test/html/EmbperlObject/epodiv.htm
Index: epodiv.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/EmbperlObject/epodiv.htm,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- epodiv.htm 2 May 2001 08:59:16 -0000 1.1.4.2
+++ epodiv.htm 29 Jan 2002 16:02:52 -0000 1.1.4.3
@@ -195,9 +195,9 @@
</tr>
</table>
-<P>[+ $HTML::Embperl::VERSION +]<P>
+<P>[+ $Embperl::VERSION +]<P>
-<P>[+ $tabmode +]<P>
+<P>[+ $tabmode || 17 +]<P>
<P>[+ local $tabmode = 1 +]<P>
<P>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
