richter 02/03/02 11:55:47
Modified: . Tag: Embperl2c DOM.xs Embperl.xs README.v2
epapinit.c epinit.c epmain.c eppublic.h
eg/web Tag: Embperl2c pod.xsl
test/conf Tag: Embperl2c httpd.conf.src
Log:
apache config
Revision Changes Path
No revision
No revision
1.1.2.26 +3 -3 embperl/DOM.xs
Index: DOM.xs
===================================================================
RCS file: /home/cvs/embperl/DOM.xs,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- DOM.xs 12 Feb 2002 09:11:44 -0000 1.1.2.25
+++ DOM.xs 2 Mar 2002 19:55:46 -0000 1.1.2.26
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: DOM.xs,v 1.1.2.25 2002/02/12 09:11:44 richter Exp $
+# $Id: DOM.xs,v 1.1.2.26 2002/03/02 19:55:46 richter Exp $
#
###################################################################################
@@ -190,7 +190,7 @@
CODE:
sT = SV2String (sText, nText) ;
pDomTree = DomTree_self(pParentNode -> xDomTree) ;
- Node_appendChild (r -> pApp, pDomTree, pParentNode -> xNode, r ->
Component.nCurrRepeatLevel, nType, 0, sT, nText, 0, 0, NULL) ;
+ Node_appendChild (r -> pApp, pDomTree, pParentNode -> xNode, r ->
Component.nCurrRepeatLevel, (tNodeType)nType, 0, sT, nText, 0, 0, NULL) ;
void
@@ -204,7 +204,7 @@
STRLEN nText ;
char * sT = SV2String (sText, nText) ;
tDomTree * pDomTree = DomTree_self(xDomTree) ;
- Node_appendChild (r -> pApp, pDomTree, xParent, r ->
Component.nCurrRepeatLevel, nType, 0, sT, nText, 0, 0, NULL) ;
+ Node_appendChild (r -> pApp, pDomTree, xParent, r ->
Component.nCurrRepeatLevel, (tNodeType)nType, 0, sT, nText, 0, 0, NULL) ;
char *
1.29.4.46 +1 -1 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.45
retrieving revision 1.29.4.46
diff -u -r1.29.4.45 -r1.29.4.46
--- Embperl.xs 16 Feb 2002 18:00:47 -0000 1.29.4.45
+++ Embperl.xs 2 Mar 2002 19:55:46 -0000 1.29.4.46
@@ -23,7 +23,7 @@
SV * pApacheSrvSV
SV * pPerlParam
CODE:
- RETVAL = embperl_Init (aTHX_ pApacheSrvSV, pPerlParam) ;
+ RETVAL = embperl_Init (aTHX_ pApacheSrvSV, pPerlParam, NULL) ;
OUTPUT:
RETVAL
1.1.4.22 +8 -19 embperl/Attic/README.v2
Index: README.v2
===================================================================
RCS file: /home/cvs/embperl/Attic/README.v2,v
retrieving revision 1.1.4.21
retrieving revision 1.1.4.22
diff -u -r1.1.4.21 -r1.1.4.22
--- README.v2 27 Nov 2001 10:43:36 -0000 1.1.4.21
+++ README.v2 2 Mar 2002 19:55:46 -0000 1.1.4.22
@@ -9,7 +9,7 @@
WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-$Id: README.v2,v 1.1.4.21 2001/11/27 10:43:36 richter Exp $
+$Id: README.v2,v 1.1.4.22 2002/03/02 19:55:46 richter Exp $
### !! IMPORTANT !! IMPORTANT !! IMPORTANT !! IMPORTANT !! IMPORTANT !!
@@ -139,36 +139,25 @@
terminated with a semikolon. To let old code work, just wrap it into a do
e.g. [+ do { my $a = $b + 5 ; $a } +]
+- EMBPERL_INPUT_FUNC and EMBPERL_OUTPUT_FUNC are not supported anymore
+ You can the same result and much more by writing custom provider.
+
The following things are not fully tested/working yet:
------------------------------------------------------
- [- exit -]
+ exit works not inside of [$ sub $], outside it works
- safe namespaces
-- print to OUT does not work correctly inside of loops
-
Embperl 1.x compatibility flag
------------------------------
-If you don't have a separate computer to make the test setup, you can
-include
-
-PerlSetEnv EMBPERL_EP1COMPAT 1
-
-at the top level of your httpd.conf, then Embperl will behave just the same
-like Embperl 1.3b7. In the directories where you make your tests, you
-include a
-
-PerlSetEnv EMBPERL_EP1COMPAT 0
-
-to enable the new engine.
-
-but _DON'T_ use this one a production machine. While this compatibility mode
-is tested and shows no problems for me, it's not so hard tested as 1.3b7
-itself!
+The Embperl 1 compatibility flags has been remove in 2.0b6. Since starting
+with 2.0b6 Embperl uses the Embperl namespace, it it possible to install
+Embperl 1.x and 2.0 on the same machine without conflicts.
Addtional Config directives
1.1.2.25 +210 -57 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- epapinit.c 1 Mar 2002 21:42:46 -0000 1.1.2.24
+++ epapinit.c 2 Mar 2002 19:55:46 -0000 1.1.2.25
@@ -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.24 2002/03/01 21:42:46 richter Exp $
+# $Id: epapinit.c,v 1.1.2.25 2002/03/02 19:55:46 richter Exp $
#
###################################################################################*/
@@ -29,18 +29,23 @@
#define EPCFG_STR EPCFG
#define EPCFG_INT EPCFG
#define EPCFG_BOOL EPCFG
-#define EPCFG_CV EPCFG
-#define EPCFG_SV EPCFG
-#define EPCFG_HV EPCFG
-#define EPCFG_REGEX EPCFG
#define EPCFG_CHAR EPCFG
+
+#define EPCFG_CV EPCFG_SAVE
+#define EPCFG_SV EPCFG_SAVE
+#define EPCFG_HV EPCFG_SAVE
+#define EPCFG_REGEX EPCFG_SAVE
+#define EPCFG_AV(STRUCT,TYPE,NAME,CFGNAME,SEPARATOR)
EPCFG_SAVE(STRUCT,TYPE,NAME,CFGNAME)
+
#define EPCFG_APP
#define EPCFG_REQ
#define EPCFG_COMPONENT
-#define EPCFG_AV(STRUCT,TYPE,NAME,CFGNAME,SEPARATOR) EPCFG(STRUCT,TYPE,NAME,CFGNAME)
#define EPCFG(STRUCT,TYPE,NAME,CFGNAME) int set_##STRUCT##NAME:1 ;
+#define EPCFG_SAVE(STRUCT,TYPE,NAME,CFGNAME) \
+ int set_##STRUCT##NAME:1 ; \
+ char * save_##STRUCT##NAME ;
struct tApacheDirConfig
{
@@ -60,6 +65,8 @@
#endif
+#undef EPCFG_SAVE
+#define EPCFG_SAVE EPCFG
#undef EPCFG
#define EPCFG(STRUCT,TYPE,NAME,CFGNAME) \
char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, tApacheDirConfig *
pDirCfg, char * arg) ;
@@ -67,14 +74,16 @@
#include "epcfg.h"
/* define config data structure */
-
#undef EPCFG
+#undef EPCFG_SAVE
+#define EPCFG_SAVE EPCFG
#define EPCFG(STRUCT,TYPE,NAME,CFGNAME) \
{ "EMBPERL_"#CFGNAME, embperl_Apache_Config_##STRUCT##NAME, NULL, RSRC_CONF
| OR_OPTIONS, TAKE1, "" },
static char * embperl_Apache_Config_useenv (cmd_parms *cmd, tApacheDirConfig *
pDirCfg, bool arg) ;
static void *embperl_create_dir_config(pool *p, char *d) ;
static void *embperl_create_server_config(pool *p, server_rec *s) ;
+static void *embperl_merge_dir_config (pool *p, void *basev, void *addv) ;
static const command_rec embperl_cmds[] =
{
@@ -94,9 +103,9 @@
STANDARD_MODULE_STUFF,
embperl_ApacheInit, /* initializer */
embperl_create_dir_config, /* dir config creater */
- NULL, /* dir merger --- default is to override */
+ embperl_merge_dir_config, /* dir merger --- default is to override */
embperl_create_server_config, /* server config */
- NULL, /* merge server configs */
+ embperl_merge_dir_config, /* merge server configs */
embperl_cmds, /* command table */
NULL, /* handlers */
NULL, /* filename translation */
@@ -132,10 +141,17 @@
static void embperl_ApacheInit (server_rec *s, pool *p)
{
+ int rc ;
pool * subpool = ap_make_sub_pool(p);
+ dTHX ;
ap_register_cleanup(subpool, NULL, embperl_ApacheInitCleanup,
embperl_ApacheInitCleanup);
ap_add_version_component ("Embperl/"VERSION) ;
+
+ if ((rc = embperl_Init (aTHX_ NULL, NULL, s)) != ok)
+ {
+ fprintf ((FILE *)stderr, "Initialization of Embperl failed (#%d)\n", rc) ;
+ }
}
static void embperl_ApacheInitCleanup (void * p)
@@ -151,8 +167,6 @@
{
tApacheDirConfig *cfg = (tApacheDirConfig *) ap_pcalloc(p,
sizeof(tApacheDirConfig));
- memset (cfg, 0, sizeof (*cfg)) ;
-
embperl_DefaultReqConfig (&cfg -> ReqConfig) ;
embperl_DefaultAppConfig (&cfg -> AppConfig) ;
embperl_DefaultComponentConfig (&cfg -> ComponentConfig) ;
@@ -162,22 +176,84 @@
}
+
static void *embperl_create_server_config(pool *p, server_rec *s)
{
tApacheDirConfig *cfg = (tApacheDirConfig *) ap_pcalloc(p,
sizeof(tApacheDirConfig));
- memset (cfg, 0, sizeof (*cfg)) ;
-
embperl_DefaultReqConfig (&cfg -> ReqConfig) ;
embperl_DefaultAppConfig (&cfg -> AppConfig) ;
embperl_DefaultComponentConfig (&cfg -> ComponentConfig) ;
- /*cfg -> bUseEnv = -1 ; */
- cfg -> bUseEnv = 1 ;
+ cfg -> bUseEnv = -1 ;
return cfg;
}
+#define EPCFG_APP
+#define EPCFG_REQ
+#define EPCFG_COMPONENT
+
+#undef EPCFG_STR
+#undef EPCFG_INT
+#undef EPCFG_BOOL
+#undef EPCFG_CHAR
+#undef EPCFG_CV
+#undef EPCFG_SV
+#undef EPCFG_HV
+#undef EPCFG_AV
+#undef EPCFG_REGEX
+
+#define EPCFG_STR EPCFG
+#define EPCFG_INT EPCFG
+#define EPCFG_BOOL EPCFG
+#define EPCFG_CHAR EPCFG
+
+#define EPCFG_CV EPCFG_SAVE
+#define EPCFG_SV EPCFG_SAVE
+#define EPCFG_HV EPCFG_SAVE
+#define EPCFG_REGEX EPCFG_SAVE
+#define EPCFG_AV(STRUCT,TYPE,NAME,CFGNAME,SEPARATOR)
EPCFG_SAVE(STRUCT,TYPE,NAME,CFGNAME)
+
+#undef EPCFG
+#define EPCFG(STRUCT,TYPE,NAME,CFGNAME) \
+ if (add -> set_##STRUCT##NAME) \
+ { \
+ mrg -> set_##STRUCT##NAME = 1 ; \
+ mrg -> STRUCT.NAME = add -> STRUCT.NAME ; \
+ }
+
+#undef EPCFG_SAVE
+#define EPCFG_SAVE(STRUCT,TYPE,NAME,CFGNAME) \
+ if (add -> set_##STRUCT##NAME) \
+ { \
+ mrg -> set_##STRUCT##NAME = 1 ; \
+ mrg -> STRUCT.NAME = add -> STRUCT.NAME ; \
+ mrg -> save_##STRUCT##NAME = add -> save_##STRUCT##NAME ; \
+ }
+
+
+
+static void *embperl_merge_dir_config (pool *p, void *basev, void *addv)
+ {
+ tApacheDirConfig *mrg = (tApacheDirConfig *)ap_palloc (p,
sizeof(tApacheDirConfig));
+ tApacheDirConfig *base = (tApacheDirConfig *)basev;
+ tApacheDirConfig *add = (tApacheDirConfig *)addv;
+
+ memcpy (mrg, base, sizeof (*mrg)) ;
+
+#include "epcfg.h"
+
+ if (add -> bUseEnv >= 0)
+ base -> bUseEnv = add -> bUseEnv ;
+
+ return mrg ;
+ }
+
+
+
+
+
static char * embperl_Apache_Config_useenv (cmd_parms *cmd, tApacheDirConfig *
pDirCfg, bool arg)
{ \
pDirCfg -> bUseEnv = arg ;
@@ -198,9 +274,9 @@
{
*ppConfig = (tApacheDirConfig *) get_module_config(r->per_dir_config,
&embperl_module);
}
- else if(s && s->module_config)
+ else if(s && s->lookup_defaults) /*s->module_config)*/
{
- *ppConfig = (tApacheDirConfig *) get_module_config(s->module_config,
&embperl_module);
+ *ppConfig = (tApacheDirConfig *) get_module_config(s->lookup_defaults
/*s->module_config*/, &embperl_module);
}
}
return ok ;
@@ -214,6 +290,67 @@
}
+/* --- functions for converting string to Perl structures --- */
+
+#undef EPCFG_STR
+#undef EPCFG_INT
+#undef EPCFG_BOOL
+#undef EPCFG_CHAR
+#define EPCFG_STR EPCFG
+#define EPCFG_INT EPCFG
+#define EPCFG_BOOL EPCFG
+#define EPCFG_CHAR EPCFG
+#undef EPCFG
+#define EPCFG(STRUCT,TYPE,NAME,CFGNAME)
+
+
+#undef EPCFG_SV
+#define EPCFG_SV(STRUCT,TYPE,NAME,CFGNAME) \
+ if (pDirCfg -> save_##STRUCT##NAME && !pDirCfg -> STRUCT.NAME) \
+ pDirCfg -> STRUCT.NAME = newSVpv((char *)pDirCfg -> save_##STRUCT##NAME, 0)
;
+
+
+#undef EPCFG_CV
+#define EPCFG_CV(STRUCT,TYPE,NAME,CFGNAME) \
+ if (pDirCfg -> save_##STRUCT##NAME && !pDirCfg -> STRUCT.NAME) \
+ { \
+ int rc ;\
+ if ((rc = EvalConfig (pApp, sv_2mortal(newSVpv(pDirCfg ->
save_##STRUCT##NAME, 0)), 0, NULL, "Configuration: EMBPERL_"#CFGNAME, &pDirCfg ->
STRUCT.NAME)) != ok) \
+ LogError (pReq, rc) ; \
+ return rc ; \
+ }
+
+
+#undef EPCFG_AV
+#define EPCFG_AV(STRUCT,TYPE,NAME,CFGNAME,SEPARATOR) \
+ if (pDirCfg -> save_##STRUCT##NAME && !pDirCfg -> STRUCT.NAME) \
+ { \
+ pDirCfg -> STRUCT.NAME = embperl_String2AV(pApp, pDirCfg ->
save_##STRUCT##NAME, SEPARATOR) ;\
+ tainted = 0 ; \
+ }
+
+
+#undef EPCFG_HV
+#define EPCFG_HV(STRUCT,TYPE,NAME,CFGNAME) \
+ if (pDirCfg -> save_##STRUCT##NAME && !pDirCfg -> STRUCT.NAME) \
+ { \
+ pDirCfg -> STRUCT.NAME = embperl_String2HV(pApp, pDirCfg ->
save_##STRUCT##NAME, ' ', NULL) ;\
+ tainted = 0 ; \
+ }
+
+
+#undef EPCFG_REGEX
+#define EPCFG_REGEX(STRUCT,TYPE,NAME,CFGNAME) \
+ if (pDirCfg -> save_##STRUCT##NAME && !pDirCfg -> STRUCT.NAME) \
+ { \
+ int rc ; \
+ if ((rc = EvalRegEx (pApp, pDirCfg -> save_##STRUCT##NAME, "Configuration:
EMBPERL_"#CFGNAME, &pDirCfg -> STRUCT.NAME)) != ok) \
+ return rc ; \
+ tainted = 0 ; \
+ }
+
+
+
int embperl_GetApacheAppConfig (/*in*/ tThreadData * pThread,
/*in*/ tMemPool * pPool,
/*in*/ tApacheDirConfig * pDirCfg,
@@ -221,15 +358,25 @@
{
+ eptTHX_
+ tApp * pApp = NULL ;
if(pDirCfg)
{
+#define EPCFG_APP
+#undef EPCFG_REQ
+#undef EPCFG_COMPONENT
+
+#include "epcfg.h"
+
memcpy (&pConfig -> pPool + 1, &pDirCfg -> AppConfig.pPool + 1, sizeof
(*pConfig) - ((tUInt8 *)(&pConfig -> pPool) - (tUInt8 *)pConfig) - sizeof (pConfig ->
pPool)) ;
+ pConfig -> bDebug = pDirCfg -> ComponentConfig.bDebug ;
+
+
if (pDirCfg -> bUseEnv)
embperl_GetCGIAppConfig (pThread, pPool, pConfig, 0) ;
}
else
embperl_DefaultAppConfig (pConfig) ;
- /* ### */ embperl_GetCGIAppConfig (pThread, pPool, pConfig, 0) ;
return ok ;
}
@@ -242,21 +389,32 @@
{
+#define a pApp
+ epaTHX_
+#undef a
+
if(pDirCfg)
{
+#undef EPCFG_APP
+#define EPCFG_REQ
+#undef EPCFG_COMPONENT
+
+#include "epcfg.h"
+
memcpy (&pConfig -> pPool + 1, &pDirCfg -> ReqConfig.pPool + 1, sizeof
(*pConfig) - ((tUInt8 *)(&pConfig -> pPool) - (tUInt8 *)pConfig) - sizeof (pConfig ->
pPool)) ;
+ pConfig -> bDebug = pDirCfg -> ComponentConfig.bDebug ;
+ pConfig -> bOptions = pDirCfg -> ComponentConfig.bOptions ;
+
if (pDirCfg -> bUseEnv)
embperl_GetCGIReqConfig (pApp, pPool, pConfig, 0) ;
}
else
embperl_DefaultReqConfig (pConfig) ;
- /* ### */ embperl_GetCGIReqConfig (pApp, pPool, pConfig, 0) ;
pConfig -> bOptions |= optSendHttpHeader ;
return ok ;
}
-
int embperl_GetApacheComponentConfig (/*in*/ tReq * pReq,
/*in*/ tMemPool * pPool,
/*in*/ tApacheDirConfig * pDirCfg,
@@ -264,15 +422,26 @@
{
+
if(pDirCfg)
{
+ #define r pReq
+ epTHX_
+ #undef r
+ tApp * pApp = pReq -> pApp ;
+
+#undef EPCFG_APP
+#undef EPCFG_REQ
+#define EPCFG_COMPONENT
+
+#include "epcfg.h"
+
memcpy (&pConfig -> pPool + 1, &pDirCfg -> ComponentConfig.pPool + 1,
sizeof (*pConfig) - ((tUInt8 *)(&pConfig -> pPool) - (tUInt8 *)pConfig) - sizeof
(pConfig -> pPool)) ;
if (pDirCfg -> bUseEnv)
embperl_GetCGIComponentConfig (pReq, pPool, pConfig, 0) ;
}
else
embperl_DefaultComponentConfig (pConfig) ;
- /* ### */ embperl_GetCGIComponentConfig (pReq, pPool, pConfig, 0) ;
return ok ;
}
@@ -334,6 +503,9 @@
+/* --- functions for apache config cmds --- */
+
+
#undef EPCFG
#undef EPCFG_INT
#define EPCFG_INT(STRUCT,TYPE,NAME,CFGNAME) \
@@ -364,16 +536,6 @@
return NULL; \
}
-#undef EPCFG_SV
-#define EPCFG_SV(STRUCT,TYPE,NAME,CFGNAME) \
-char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, tApacheDirConfig *
pDirCfg, char* arg) \
- { \
- epdcTHX_ \
- pDirCfg -> STRUCT.NAME = newSVpv((char *)arg, 0) ; \
- pDirCfg -> set_##STRUCT##NAME = 1 ; \
- return NULL; \
- }
-
#undef EPCFG_CHAR
#define EPCFG_CHAR(STRUCT,TYPE,NAME,CFGNAME) \
char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, tApacheDirConfig *
pDirCfg, char * arg) \
@@ -384,37 +546,28 @@
}
#undef EPCFG_CV
-#define EPCFG_CV(STRUCT,TYPE,NAME,CFGNAME) \
-char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, tApacheDirConfig *
pDirCfg, char * arg) \
- { \
-/* int rc ;\
- if ((rc = EvalConfig (pReq, sv_2mortal(newSVpv(arg, 0)), 0, NULL, &pDirCfg ->
STRUCT.NAME)) != ok) \
- return LogError (pReq, rc) ; \
- pDirCfg -> set_##STRUCT##NAME = 1 ; \
- return NULL; \
-*/ return "unimplemented" ; \
- }
-
+#undef EPCFG_SV
+#undef EPCFG_HV
#undef EPCFG_AV
-#define EPCFG_AV(STRUCT,TYPE,NAME,CFGNAME,SEPARATOR) \
-char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, tApacheDirConfig *
pDirCfg, char * arg) \
- { \
- return "unimplemented" ; \
- }
+#undef EPCFG_REGEX
+#define EPCFG_CV EPCFG_SAVE
+#define EPCFG_SV EPCFG_SAVE
+#define EPCFG_HV EPCFG_SAVE
+#define EPCFG_REGEX EPCFG_SAVE
+#define EPCFG_AV(STRUCT,TYPE,NAME,CFGNAME,SEPARATOR)
EPCFG_SAVE(STRUCT,TYPE,NAME,CFGNAME)
-#undef EPCFG_HV
-#define EPCFG_HV(STRUCT,TYPE,NAME,CFGNAME) \
-char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, tApacheDirConfig *
pDirCfg, char * arg) \
+#undef EPCFG_SAVE
+#define EPCFG_SAVE(STRUCT,TYPE,NAME,CFGNAME) \
+char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, tApacheDirConfig *
pDirCfg, char* arg) \
{ \
- return "unimplemented" ; \
+ pDirCfg -> save_##STRUCT##NAME = ap_pstrdup(cmd -> pool, arg) ; \
+ pDirCfg -> set_##STRUCT##NAME = 1 ; \
+ return NULL ; \
}
-#undef EPCFG_REGEX
-#define EPCFG_REGEX(STRUCT,TYPE,NAME,CFGNAME) \
-char * embperl_Apache_Config_##STRUCT##NAME (cmd_parms *cmd, tApacheDirConfig *
pDirCfg, char * arg) \
- { \
- return "unimplemented" ; \
- }
+#define EPCFG_APP
+#define EPCFG_REQ
+#define EPCFG_COMPONENT
#include "epcfg.h"
1.1.2.34 +13 -8 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- epinit.c 1 Mar 2002 05:38:51 -0000 1.1.2.33
+++ epinit.c 2 Mar 2002 19:55:46 -0000 1.1.2.34
@@ -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.33 2002/03/01 05:38:51 richter Exp $
+# $Id: epinit.c,v 1.1.2.34 2002/03/02 19:55:46 richter Exp $
#
###################################################################################*/
@@ -668,7 +668,8 @@
int embperl_Init (/*in*/ pTHX_
/*in*/ SV * pApacheSrvSV,
- /*in*/ SV * pPerlParam)
+ /*in*/ SV * pPerlParam,
+ /*in*/ server_rec * ap_s)
{
int rc ;
@@ -676,6 +677,15 @@
tApp * pApp ;
tApacheDirConfig * pApacheCfg = NULL ;
+#ifdef APACHE
+ if (pApacheSrvSV && SvROK (pApacheSrvSV))
+ {
+ /* when running under mod_perl only register the module */
+ /* rest will be call from module initialzation when config has been read */
+ embperl_ApacheAddModule () ;
+ return ok ;
+ }
+#endif
if (!pMainPool)
pMainPool = ep_init_alloc() ;
@@ -684,13 +694,8 @@
return rc ;
#ifdef APACHE
- if (pApacheSrvSV && SvROK (pApacheSrvSV))
- {
- server_rec * ap_s = (server_rec *)SvIV((SV*)SvRV(pApacheSrvSV));
-
- embperl_ApacheAddModule () ;
+ if (ap_s)
embperl_GetApacheConfig (pThread, NULL, ap_s, &pApacheCfg) ;
- }
#endif
if ((rc = embperl_SetupApp (aTHX_ pThread, pApacheCfg, pPerlParam, &pApp)) !=
ok)
1.75.4.107 +9 -5 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.106
retrieving revision 1.75.4.107
diff -u -r1.75.4.106 -r1.75.4.107
--- epmain.c 1 Mar 2002 08:24:36 -0000 1.75.4.106
+++ epmain.c 2 Mar 2002 19:55:46 -0000 1.75.4.107
@@ -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.106 2002/03/01 08:24:36 richter Exp $
+# $Id: epmain.c,v 1.75.4.107 2002/03/02 19:55:46 richter Exp $
#
###################################################################################*/
@@ -640,10 +640,6 @@
av_clear (r -> pErrState) ;
*/
-#ifdef APACHE
- /* This must be the very very very last !!!!! */
- r -> pApacheReq = NULL ;
-#endif
return ok ;
}
@@ -1353,8 +1349,16 @@
perl_call_method ("pnotes", G_DISCARD) ;
}
#endif
+#ifdef APACHE
+ /* This must be the very very very last !!!!! */
+ r -> pApacheReq = NULL ;
+#endif
return 500 ;
}
+#ifdef APACHE
+ /* This must be the very very very last !!!!! */
+ r -> pApacheReq = NULL ;
+#endif
return ok ;
}
1.1.2.10 +3 -2 embperl/Attic/eppublic.h
Index: eppublic.h
===================================================================
RCS file: /home/cvs/embperl/Attic/eppublic.h,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- eppublic.h 12 Feb 2002 09:11:44 -0000 1.1.2.9
+++ eppublic.h 2 Mar 2002 19:55:46 -0000 1.1.2.10
@@ -10,14 +10,15 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eppublic.h,v 1.1.2.9 2002/02/12 09:11:44 richter Exp $
+# $Id: eppublic.h,v 1.1.2.10 2002/03/02 19:55:46 richter Exp $
#
###################################################################################*/
int embperl_Init (pTHX_
SV * pApacheSrvSV,
- SV * pPerlParam) ;
+ SV * pPerlParam,
+ server_rec * ap_s) ;
int embperl_InitRequest ( pTHX_
SV * pApacheReqSV,
No revision
No revision
1.1.2.4 +1 -1 embperl/eg/web/Attic/pod.xsl
Index: pod.xsl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/pod.xsl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- pod.xsl 2 Mar 2002 00:46:17 -0000 1.1.2.3
+++ pod.xsl 2 Mar 2002 19:55:47 -0000 1.1.2.4
@@ -398,7 +398,7 @@
</xsl:variable>
<xsl:choose>
- <xsl:when test="$page">
+ <xsl:when test="$page!=''">
<a href="?page={$page}#sect_{$sect}"><xsl:value-of
select="$txt"/></a>
</xsl:when>
<xsl:otherwise>
No revision
No revision
1.24.4.49 +104 -151 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.48
retrieving revision 1.24.4.49
diff -u -r1.24.4.48 -r1.24.4.49
--- httpd.conf.src 2 Mar 2002 00:46:17 -0000 1.24.4.48
+++ httpd.conf.src 2 Mar 2002 19:55:47 -0000 1.24.4.49
@@ -49,63 +49,32 @@
PerlWarn On
-
-SetEnv EMBPERL_DEBUG $EPDEBUG
-SetEnv EMBPERL_VIRTLOG /embperl/log
-PerlSetEnv EMBPERL_LOG \"$EPPATH/test/tmp/test.log\"
-SetEnv EMBPERL_LOG \"$EPPATH/test/tmp/test.log\"
-
PerlSetEnv EMBPERL_SRC \"$EPPATH\"
SetEnv EMBPERL_SRC \"$EPPATH\"
-
-
PerlSetEnv DMALLOC_OPTIONS \"log=$EPPATH/test/tmp/httpd.dmalloc.log,debug=0x3f03\"
-
SetEnv DMALLOC_OPTIONS \"log=$EPPATH/test/tmp/httpd.dmalloc.log,debug=0x3f03\"
+PerlRequire \"$EPPATH/test/conf/$EPSTARTUP\"
+#PerlModule causes some warning with Perl 5.005_03
+#PerlModule Embperl
+AddModule embperl.c
-EOD
-
-
-if ($^O eq 'MSWin32' && $EPMODPERLVERSION >= 1.24)
- { # ActiveState workarounds...
- print OFH "SetEnv EMBPERL_OPTIONS 0\n" ;
- print OFH "SetEnv EMBPERL_ESCMODE 3\n" ;
- }
-
-if ($EPSESSIONVERSION)
- {
-print OFH <<EOD ;
-
-PerlSetEnv EMBPERL_SESSION_CLASS $EPSESSIONCLASS
-SetEnv EMBPERL_SESSION_CLASS $EPSESSIONCLASS
-PerlSetEnv SESSION_FILE_DIRECTORY \"$EPPATH/test/tmp\"
-PerlSetEnv SESSION_DBI_DATASOURCE $EPSESSIONDS
+Embperl_UseEnv off
-PerlSetEnv EMBPERL_MAILDEBUG 1
+EMBPERL_DEBUG $EPDEBUG
+#EMBPERL_VIRTLOG /embperl/log
+EMBPERL_LOG \"$EPPATH/test/tmp/test.log\"
EOD
- }
-if ($EPSESSIONVERSION && ($EPSESSIONVERSION =~ /^1\.0\d$/))
- {
-print OFH <<EOD ;
-#PerlSetEnv EMBPERL_SESSION_CLASSES "MemoryStore NullLocker"
-PerlSetEnv EMBPERL_SESSION_CLASSES "FileStore NullLocker"
-PerlSetEnv EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
-SetEnv EMBPERL_SESSION_CLASSES "FileStore NullLocker"
-SetEnv EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
-EOD
- }
-elsif ($EPSESSIONVERSION && ($EPSESSIONVERSION > 1))
+
+if ($EPSESSIONVERSION && ($EPSESSIONVERSION > 1))
{
print OFH <<EOD ;
-PerlSetEnv EMBPERL_SESSION_CLASSES "File Null"
-PerlSetEnv EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
-SetEnv EMBPERL_SESSION_CLASSES "File Null"
-SetEnv EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
+EMBPERL_SESSION_CLASSES "File Null"
+EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
EOD
}
@@ -114,26 +83,14 @@
{
print OFH <<EOD ;
-PerlSetEnv EMBPERL_SESSION_HANDLER_CLASS no
-SetEnv EMBPERL_SESSION_HANDLER_CLASS no
+EMBPERL_SESSION_HANDLER_CLASS no
EOD
}
print OFH <<EOD ;
-SetEnv EMBPERL_ALLOW (asc|\\.xml\$|\\.htm\$)
-
-
-PerlRequire \"$EPPATH/test/conf/$EPSTARTUP\"
-
-#PerlModule causes some warning with Perl 5.005_03
-
-#PerlModule Embperl
-AddModule embperl.c
-
-
-#Embperl_UseEnv on
+EMBPERL_ALLOW (asc|\\.xml\$|\\.htm\$)
<Location /embperl/log>
@@ -164,28 +121,25 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv LOC embperl_sub
</Location>
<Location /embperl>
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv LOC embperl
</Location>
<Location /embperl2>
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv LOC embperl
</Location>
<Location /embperl/safe>
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_OPTIONS 4
+EMBPERL_OPTIONS 4
</Location>
@@ -193,29 +147,29 @@
<Location /embperl/libxslt>
-SetEnv EMBPERL_RECIPE EmbperlLibXSLT
-PerlSetEnv EMBPERL_XSLTSTYLESHEET \"$EPPATH/test/html/xml/podold.xsl\"
+EMBPERL_RECIPE EmbperlLibXSLT
+EMBPERL_XSLTSTYLESHEET \"$EPPATH/test/html/xml/podold.xsl\"
</Location>
<Location /embperl/asclibxslt>
-PerlSetEnv EMBPERL_RECIPE EmbperlLibXSLT
-PerlSetEnv EMBPERL_XSLTSTYLESHEET \"$EPPATH/test/html/xml/pod.xsl\"
-PerlSetEnv EMBPERL_SYNTAX POD
+EMBPERL_RECIPE EmbperlLibXSLT
+EMBPERL_XSLTSTYLESHEET \"$EPPATH/test/html/xml/pod.xsl\"
+EMBPERL_SYNTAX POD
</Location>
<Location /embperl/xalan>
-PerlSetEnv EMBPERL_RECIPE EmbperlXalanXSLT
-PerlSetEnv EMBPERL_XSLTSTYLESHEET \"$EPPATH/test/html/xml/podold.xsl\"
+EMBPERL_RECIPE EmbperlXalanXSLT
+EMBPERL_XSLTSTYLESHEET \"$EPPATH/test/html/xml/podold.xsl\"
</Location>
<Location /embperl/ascxalan>
-PerlSetEnv EMBPERL_RECIPE EmbperlXalanXSLT
-PerlSetEnv EMBPERL_XSLTSTYLESHEET \"$EPPATH/test/html/xml/pod.xsl\"
-PerlSetEnv EMBPERL_SYNTAX POD
+EMBPERL_RECIPE EmbperlXalanXSLT
+EMBPERL_XSLTSTYLESHEET \"$EPPATH/test/html/xml/pod.xsl\"
+EMBPERL_SYNTAX POD
</Location>
@@ -228,44 +182,43 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_OPTIONS 12
-PerlSetEnv EMBPERL_COMPARTMENT TEST
-PerlSetEnv EMBPERL_PACKAGE TEST
+EMBPERL_OPTIONS 12
+EMBPERL_COMPARTMENT TEST
+EMBPERL_PACKAGE TEST
</Location>
<Location /embperl/rawinput>
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_OPTIONS 16
+EMBPERL_OPTIONS 16
</Location>
<Location /cgi-bin/rawinput>
-PerlSetEnv EMBPERL_OPTIONS 16
-SetEnv EMBPERL_OPTIONS 16
+EMBPERL_OPTIONS 16
</Location>
<Location /embperl/nochdir>
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_OPTIONS 384
+EMBPERL_OPTIONS 384
</Location>
<Location /embperl/nph>
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_OPTIONS 64
+EMBPERL_OPTIONS 64
</Location>
<Location /embperl/stdout>
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-#PerlSetEnv EMBPERL_OPTIONS 16384
-PerlSetEnv EMBPERL_OPTIONS 16400
-PerlSetEnv EMBPERL_ESCMODE 0
+#EMBPERL_OPTIONS 16384
+EMBPERL_OPTIONS 16400
+EMBPERL_ESCMODE 0
PerlSetupEnv Off
</Location>
@@ -273,21 +226,21 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_OPTIONS 8192
+EMBPERL_OPTIONS 8192
</Location>
<Location /embperl/noerr>
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_OPTIONS 2
+EMBPERL_OPTIONS 2
</Location>
<Location /embperl/errdoc>
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_OPTIONS 262144
+EMBPERL_OPTIONS 262144
ErrorDocument 500 /html/errmsg.htm
</Location>
@@ -295,7 +248,7 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_OPTIONS 262144
+EMBPERL_OPTIONS 262144
ErrorDocument 500 /embperl/errmsg2.htm
</Location>
@@ -305,21 +258,21 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_URIMATCH \\.htm\$
+EMBPERL_URIMATCH \\.htm\$
</Location>
-<Location /embperl/ifunc>
-SetHandler perl-script
-PerlHandler Embperl
-Options ExecCGI
-PerlSetEnv EMBPERL_INPUT_FUNC \"ProxyInput, /embperl/ifunc,
http://localhost:$EPPORT/embperl/ifuncsrc\";
-</Location>
+#<Location /embperl/ifunc>
+#SetHandler perl-script
+#PerlHandler Embperl
+#Options ExecCGI
+#EMBPERL_INPUT_FUNC \"ProxyInput, /embperl/ifunc,
http://localhost:$EPPORT/embperl/ifuncsrc\";
+#</Location>
-<Location /embperl/ifuncsrc>
-SetHandler server-parsed
-Options +Includes
-</Location>
+#<Location /embperl/ifuncsrc>
+#SetHandler server-parsed
+#Options +Includes
+#</Location>
AddType text/html .ehtml
@@ -327,7 +280,7 @@
#SetHandler perl-script
#PerlHandler Embperl
#Options ExecCGI
-#PerlSetEnv EMBPERL_INPUT_FUNC \"ProxyInput, , http://localhost:8529/src\";
+#EMBPERL_INPUT_FUNC \"ProxyInput, , http://localhost:8529/src\";
#</FilesMatch>
<Location /src>
@@ -347,7 +300,7 @@
#SetHandler perl-script
#PerlHandler Embperl
#Options ExecCGI
-#PerlSetEnv EMBPERL_INPUT_FUNC \"ProxyInput, , http://www:$EPPORT2\";
+#EMBPERL_INPUT_FUNC \"ProxyInput, , http://www:$EPPORT2\";
#</FilesMatch>
#
#</VirtualHost>
@@ -362,12 +315,12 @@
#</VirtualHost>
#
-<Location /embperl/ofunc>
-SetHandler perl-script
-PerlHandler Embperl
-Options ExecCGI
-PerlSetEnv EMBPERL_OUTPUT_FUNC \"LogOutput, $EPPATH/test/tmp/log.out\"
-</Location>
+#<Location /embperl/ofunc>
+#SetHandler perl-script
+#PerlHandler Embperl
+#Options ExecCGI
+#EMBPERL_OUTPUT_FUNC \"LogOutput, $EPPATH/test/tmp/log.out\"
+#</Location>
Alias /cgi-bin/uidurl/ \"$EPPATH/test/html/sidurl/\"
@@ -439,34 +392,34 @@
<Location /embperl/EmbperlObject/base3>
-PerlSetEnv EMBPERL_APPNAME epo3
-PerlSetEnv EMBPERL_OBJECT_BASE epobase3.htm
-PerlSetEnv EMBPERL_OBJECT_STOPDIR \"$EPPATH/test/html/EmbperlObject\"
-PerlSetEnv EMBPERL_OBJECT_ADDPATH \"$EPPATH/test/html/EmbperlObject/lib\"
-PerlSetEnv EMBPERL_OBJECT_FALLBACK epofallback.htm
-PerlSetEnv EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$\"
+EMBPERL_APPNAME epo3
+EMBPERL_OBJECT_BASE epobase3.htm
+EMBPERL_OBJECT_STOPDIR \"$EPPATH/test/html/EmbperlObject\"
+EMBPERL_OBJECT_ADDPATH \"$EPPATH/test/html/EmbperlObject/lib\"
+EMBPERL_OBJECT_FALLBACK epofallback.htm
+EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$\"
SetHandler perl-script
PerlHandler Embperl::Object
Options ExecCGI
</Location>
<Location /embperl/EmbperlObject/base2>
-PerlSetEnv EMBPERL_APPNAME epo2
-PerlSetEnv EMBPERL_OBJECT_BASE epobase2.htm
-PerlSetEnv EMBPERL_OBJECT_STOPDIR \"$EPPATH/test/html/EmbperlObject\"
-PerlSetEnv EMBPERL_OBJECT_ADDPATH \"$EPPATH/test/html/EmbperlObject/lib\"
-PerlSetEnv EMBPERL_OBJECT_FALLBACK epofallback.htm
-PerlSetEnv EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$\"
+EMBPERL_APPNAME epo2
+EMBPERL_OBJECT_BASE epobase2.htm
+EMBPERL_OBJECT_STOPDIR \"$EPPATH/test/html/EmbperlObject\"
+EMBPERL_OBJECT_ADDPATH \"$EPPATH/test/html/EmbperlObject/lib\"
+EMBPERL_OBJECT_FALLBACK epofallback.htm
+EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$\"
SetHandler perl-script
PerlHandler Embperl::Object
Options ExecCGI
</Location>
<Location /embperl/EmbperlObject>
-PerlSetEnv EMBPERL_APPNAME epo1
-PerlSetEnv EMBPERL_OBJECT_BASE epobase.htm
-PerlSetEnv EMBPERL_OBJECT_FALLBACK epofallback.htm
-PerlSetEnv EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$\"
+EMBPERL_APPNAME epo1
+EMBPERL_OBJECT_BASE epobase.htm
+EMBPERL_OBJECT_FALLBACK epofallback.htm
+EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$\"
SetHandler perl-script
PerlHandler Embperl::Object
Options ExecCGI
@@ -474,32 +427,32 @@
<Location /embperl/SSI/>
-PerlSetEnv EMBPERL_SYNTAX SSI
+EMBPERL_SYNTAX SSI
</Location>
<Location /embperl/SSIEP/>
-PerlSetEnv EMBPERL_SYNTAX "Embperl SSI"
+EMBPERL_SYNTAX "Embperl SSI"
</Location>
<Location /embperl/pod/>
-PerlSetEnv EMBPERL_SYNTAX POD
+EMBPERL_SYNTAX POD
</Location>
<Location /cgi-bin/SSI/>
-PerlSetEnv EMBPERL_SYNTAX SSI
+EMBPERL_SYNTAX SSI
</Location>
<Location /cgi-bin/SSIEP/>
-PerlSetEnv EMBPERL_SYNTAX "Embperl SSI"
+EMBPERL_SYNTAX "Embperl SSI"
</Location>
<Location /cgi-bin/pod/>
-PerlSetEnv EMBPERL_SYNTAX POD
+EMBPERL_SYNTAX POD
</Location>
@@ -510,7 +463,7 @@
#
<Location /eg>
-SetEnv EMBPERL_XSLTPROC libxslt
+EMBPERL_XSLTPROC libxslt
</Location>
@@ -525,22 +478,22 @@
<Location /eg/web>
-SetEnv EMBPERL_APPNAME EmbperlWeb
-SetEnv EMBPERL_OPTIONS 16
-SetEnv EMBPERL_ALLOW .
-PerlSetEnv EMBPERL_OBJECT_BASE base.epl
-PerlSetEnv EMBPERL_OBJECT_APP epwebapp.pl
-PerlSetEnv EMBPERL_OBJECT_STOPDIR \"$EPPATH/eg/web\"
-PerlSetEnv EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$|\\.xml\$|\\.pod\$\"
+EMBPERL_APPNAME EmbperlWeb
+EMBPERL_OPTIONS 16
+EMBPERL_ALLOW .
+EMBPERL_OBJECT_BASE base.epl
+EMBPERL_OBJECT_APP epwebapp.pl
+EMBPERL_OBJECT_STOPDIR \"$EPPATH/eg/web\"
+EMBPERL_URIMATCH \"\\.htm.?\$|\\.epl\$|\\.xml\$|\\.pod\$\"
SetHandler perl-script
PerlHandler Embperl::Object
Options ExecCGI
</Location>
<Location /eg/web/conf>
-PerlSetEnv EMBPERL_RECIPE EmbperlLibXSLT
-PerlSetEnv EMBPERL_XSLTSTYLESHEET \"$EPPATH/eg/web/conf/pod.xsl\"
-PerlSetEnv EMBPERL_SYNTAX POD
+EMBPERL_RECIPE EmbperlLibXSLT
+EMBPERL_XSLTSTYLESHEET \"$EPPATH/eg/web/conf/pod.xsl\"
+EMBPERL_SYNTAX POD
sethandler perl-script
perlhandler Embperl
</Location>
@@ -548,9 +501,9 @@
#Alias /eg/web/xml/ \"$EPPATH/eg/web/conf/\"
#<Location /eg/web/xml>
#SetEnv EMBPERL_RECIPE Embperl
-#PerlSetEnv EMBPERL_RECIPE Embperl
+#EMBPERL_RECIPE Embperl
#ForceType text/xml
-#PerlPerlSetEnv EMBPERL_SYNTAX POD
+#PerlEMBPERL_SYNTAX POD
#sethandler perl-script
#perlhandler Embperl
#</Location>
@@ -560,25 +513,25 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-SetEnv EMBPERL_XSLTSTYLESHEET \"$EPPATH/eg/xml/pod.xsl\"
-SetEnv EMBPERL_XSLTPROC libxslt
-SetEnv EMBPERL_RECIPE XSLT
+EMBPERL_XSLTSTYLESHEET \"$EPPATH/eg/xml/pod.xsl\"
+EMBPERL_XSLTPROC libxslt
+EMBPERL_RECIPE XSLT
</Location>
<Files NEWS.xml>
-SetEnv EMBPERL_XSLTSTYLESHEET \"$EPPATH/eg/xml/NEWS.xsl\"
+EMBPERL_XSLTSTYLESHEET \"$EPPATH/eg/xml/NEWS.xsl\"
</Files>
#<LocationMatch \"xalan\$\">
-#SetEnv EMBPERL_RECIPE XalanXSLT
+#EMBPERL_RECIPE XalanXSLT
#</LocationMatch>
#
#<LocationMatch \"libxslt\$\">
-#SetEnv EMBPERL_RECIPE LibXSLT
+#EMBPERL_RECIPE LibXSLT
#</LocationMatch>
@@ -651,7 +604,7 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_SESSION_MODE 0x20
+EMBPERL_SESSION_MODE 0x20
</Location>
@@ -660,7 +613,7 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_SESSION_MODE 0x02
+EMBPERL_SESSION_MODE 0x02
</Location>
@@ -669,7 +622,7 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_SESSION_MODE 0x22
+EMBPERL_SESSION_MODE 0x22
</Location>
@@ -701,8 +654,8 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI
-PerlSetEnv EMBPERL_OPTIONS 8083
-PerlSetEnv EMBPERL_DEBUG 0
+EMBPERL_OPTIONS 8083
+EMBPERL_DEBUG 0
</Location>
<Location /embperl/asp>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
