richter 02/03/03 12:17:41
Modified: . Tag: Embperl2c embpcgi.test.pl.templ epcgiinit.c
epdat2.h
Embperl Tag: Embperl2c Run.pm
test/cmp Tag: Embperl2c pod.asc pod.asc.htm
pod.asc.xalan.htm
test/conf Tag: Embperl2c httpd.conf.src
test/html/xml Tag: Embperl2c pod.xsl
xsbuilder/maps Tag: Embperl2c ep_structure.map
Log:
use_env on/off
Revision Changes Path
No revision
No revision
1.1.4.3 +15 -20 embperl/embpcgi.test.pl.templ
Index: embpcgi.test.pl.templ
===================================================================
RCS file: /home/cvs/embperl/embpcgi.test.pl.templ,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- embpcgi.test.pl.templ 31 Oct 2001 13:26:42 -0000 1.1.4.2
+++ embpcgi.test.pl.templ 3 Mar 2002 20:17:40 -0000 1.1.4.3
@@ -11,8 +11,10 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: embpcgi.test.pl.templ,v 1.1.4.2 2001/10/31 13:26:42 richter Exp $
-#
+# $Id: embpcgi.test.pl.templ,v 1.1.4.3 2002/03/03 20:17:40 richter Exp $
+
+#
+
###################################################################################
@@ -20,28 +22,21 @@
BEGIN
{
use ExtUtils::testlib ;
- eval { require Apache::Session; } if ($ENV{EMBPERL_SESSION_CLASSES}) ;
- $@ = '' ;
-
- my $cwd = $ENV{EMBPERL_SRC} ;
- my $i = 0 ;
- foreach (@INC)
- {
- $INC[$i] = "$cwd/$_" if (/^(\.\/)?blib/) ;
- $i++ ;
- }
-
- }
-
-
-use HTML::Embperl;
+ my $cwd = $ENV{EMBPERL_SRC} ;
+ my $i = 0 ;
+ foreach (@INC)
+ {
+ $INC[$i] = "$cwd/$_" if (/^(\.\/)?blib/) ;
+ $i++ ;
+ }
+ }
+use Embperl;
$^W = 1;
-
-my $rc = HTML::Embperl::runcgi ;
+my $rc = Embperl::Execute ({use_env => 1, use_redirect_env => 1}) ;
if ($rc)
{
@@ -55,7 +50,7 @@
<BODY bgcolor=\"#FFFFFF\">
<H1>embpcgi Server Error: $rc</H1>
Please contact the server administrator, $ENV{SERVER_ADMIN} and inform them of the
time the error occurred, and anything you might have done that may have caused the
error.<P><P>
-$ENV{SERVER_SOFTWARE} HTML::Embperl $HTML::Embperl::VERSION [$time]<P>
+$ENV{SERVER_SOFTWARE} Embperl $Embperl::VERSION [$time]<P>
</BODY></HTML>
EOT
1.1.2.14 +39 -12 embperl/Attic/epcgiinit.c
Index: epcgiinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcgiinit.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- epcgiinit.c 27 Feb 2002 08:19:41 -0000 1.1.2.13
+++ epcgiinit.c 3 Mar 2002 20:17:40 -0000 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: epcgiinit.c,v 1.1.2.13 2002/02/27 08:19:41 richter Exp $
+# $Id: epcgiinit.c,v 1.1.2.14 2002/03/03 20:17:40 richter Exp $
#
###################################################################################*/
@@ -23,7 +23,7 @@
{ \
char * p ; \
tainted = 0 ; \
- p = GetHashValueStr (aTHX_ pThread -> pEnvHash, "EMBPERL_"#CFGNAME, NULL) ; \
+ p = GetHashValueStr (aTHX_ pThread -> pEnvHash, REDIR"EMBPERL_"#CFGNAME, NULL)
; \
if (p) \
pConfig -> NAME = (TYPE)strtol (p, NULL, 0) ; \
tainted = 0 ; \
@@ -32,13 +32,13 @@
#undef EPCFG_BOOL
#define EPCFG_BOOL(STRUCT,TYPE,NAME,CFGNAME) \
tainted = 0 ; \
- pConfig -> NAME = (char)GetHashValueInt (aTHX_ pThread -> pEnvHash,
"EMBPERL_"#CFGNAME, pConfig -> NAME) ; \
+ pConfig -> NAME = (char)GetHashValueInt (aTHX_ pThread -> pEnvHash,
REDIR"EMBPERL_"#CFGNAME, pConfig -> NAME) ; \
tainted = 0 ;
#undef EPCFG_STR
#define EPCFG_STR(STRUCT,TYPE,NAME,CFGNAME) \
tainted = 0 ; \
- pConfig -> NAME = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash,
"EMBPERL_"#CFGNAME, pConfig -> NAME) ; \
+ pConfig -> NAME = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash,
REDIR"EMBPERL_"#CFGNAME, pConfig -> NAME) ; \
tainted = 0 ;
#undef EPCFG_CHAR
@@ -47,7 +47,7 @@
char buf[2] = { pConfig -> NAME, '\0' } ; \
char *p ; \
tainted = 0 ; \
- p = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash, "EMBPERL_"#CFGNAME,
buf) ; \
+ p = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash,
REDIR"EMBPERL_"#CFGNAME, buf) ; \
tainted = 0 ; \
pConfig -> NAME = *p ; \
}
@@ -57,7 +57,7 @@
{ \
char * arg ; \
tainted = 0 ; \
- arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, "EMBPERL_"#CFGNAME, NULL) ; \
+ arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, REDIR"EMBPERL_"#CFGNAME,
NULL) ; \
tainted = 0 ; \
if (arg) \
pConfig -> NAME = newSVpv (arg, 0) ; \
@@ -69,7 +69,7 @@
{ \
char * arg ; \
tainted = 0 ; \
- arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, "EMBPERL_"#CFGNAME, NULL) ; \
+ arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, REDIR"EMBPERL_"#CFGNAME,
NULL) ; \
tainted = 0 ; \
if (arg) \
pConfig -> NAME = embperl_String2AV(pApp, arg, SEPARATOR) ;\
@@ -81,7 +81,7 @@
{ \
char * arg ; \
tainted = 0 ; \
- arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, "EMBPERL_"#CFGNAME, NULL) ; \
+ arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, REDIR"EMBPERL_"#CFGNAME,
NULL) ; \
tainted = 0 ; \
if (arg) \
pConfig -> NAME = embperl_String2HV(pApp, arg, ' ', NULL) ;\
@@ -94,7 +94,7 @@
int rc ;\
char * arg ; \
tainted = 0 ; \
- arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, "EMBPERL_"#CFGNAME, NULL) ; \
+ arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, REDIR"EMBPERL_"#CFGNAME,
NULL) ; \
tainted = 0 ; \
if (arg) \
if ((rc = EvalConfig (pApp, sv_2mortal(newSVpv(arg, 0)), 0, NULL,
"Configuration: EMBPERL_"#CFGNAME, &pConfig -> NAME)) != ok) \
@@ -108,7 +108,7 @@
int rc ;\
char * arg ; \
tainted = 0 ; \
- arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, "EMBPERL_"#CFGNAME, NULL) ; \
+ arg = GetHashValueStr (aTHX_ pThread -> pEnvHash, REDIR"EMBPERL_"#CFGNAME,
NULL) ; \
tainted = 0 ; \
if (arg) \
if ((rc = EvalRegEx (pApp, arg, "Configuration: EMBPERL_"#CFGNAME, &pConfig
-> NAME)) != ok) \
@@ -143,8 +143,13 @@
embperl_DefaultAppConfig (pConfig) ;
#define EPCFG_APP
+ #define REDIR ""
+ #include "epcfg.h"
+ #undef REDIR
+ #define REDIR "REDIRECT_"
#include "epcfg.h"
#undef EPCFG_APP
+ #undef REDIR
return ok ;
}
@@ -164,8 +169,19 @@
embperl_DefaultReqConfig (pConfig) ;
#define EPCFG_REQ
- #include "epcfg.h"
+ #define REDIR ""
+ if (pApp -> Config.bUseEnv)
+ {
+ #include "epcfg.h"
+ }
+ #undef REDIR
+ #define REDIR "REDIRECT_"
+ if (pApp -> Config.bUseRedirectEnv)
+ {
+ #include "epcfg.h"
+ }
#undef EPCFG_REQ
+ #undef REDIR
return ok ;
}
@@ -186,8 +202,19 @@
embperl_DefaultComponentConfig (pConfig) ;
#define EPCFG_COMPONENT
- #include "epcfg.h"
+ #define REDIR ""
+ if (pApp -> Config.bUseEnv)
+ {
+ #include "epcfg.h"
+ }
+ #undef REDIR
+ #define REDIR "REDIRECT_"
+ if (pApp -> Config.bUseRedirectEnv)
+ {
+ #include "epcfg.h"
+ }
#undef EPCFG_COMPONENT
+ #undef REDIR
return ok ;
}
1.1.2.30 +5 -3 embperl/Attic/epdat2.h
Index: epdat2.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdat2.h,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- epdat2.h 27 Feb 2002 11:58:23 -0000 1.1.2.29
+++ epdat2.h 3 Mar 2002 20:17:40 -0000 1.1.2.30
@@ -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.29 2002/02/27 11:58:23 richter Exp $
+# $Id: epdat2.h,v 1.1.2.30 2002/03/03 20:17:40 richter Exp $
#
###################################################################################*/
@@ -94,8 +94,8 @@
typedef struct tReqConfig
{
- SV * _perlsv ; /**< The perl reference to this structure */
- tMemPool * pPool ; /**< pool for memorymanagement */
+ SV * _perlsv ; /**< The perl reference to this structure */
+ tMemPool * pPool ; /**< pool for memorymanagement */
CV * pAllow ;
CV * pUriMatch ;
char cMultFieldSep ;
@@ -123,6 +123,8 @@
SV * _perlsv ; /**< The perl reference to this structure */
tMemPool * pPool ; /**< pool for memorymanagement */
char * sAppName ;
+ bool bUseEnv ; /**< Take configuration values out of the
environment */
+ bool bUseRedirectEnv ; /**< Take configuration values out of the
environment. Remove REDIRECT_ prefix. */
char * sSessionHandlerClass ;
HV * pSessionArgs ;
AV * pSessionClasses ;
No revision
No revision
1.1.2.6 +2 -1 embperl/Embperl/Attic/Run.pm
Index: Run.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Run.pm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Run.pm 1 Mar 2002 05:38:52 -0000 1.1.2.5
+++ Run.pm 3 Mar 2002 20:17:40 -0000 1.1.2.6
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Run.pm,v 1.1.2.5 2002/03/01 05:38:52 richter Exp $
+# $Id: Run.pm,v 1.1.2.6 2002/03/03 20:17:40 richter Exp $
#
###################################################################################
@@ -53,6 +53,7 @@
$param{'param'} = $_[1] if (defined ($_[1])) ;
+ $param{'use_env'} = 1 ;
$rc = Embperl::Execute (\%param) ;
No revision
No revision
1.1.2.6 +3 -0 embperl/test/cmp/Attic/pod.asc
Index: pod.asc
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/pod.asc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- pod.asc 2 Mar 2002 00:46:17 -0000 1.1.2.5
+++ pod.asc 3 Mar 2002 20:17:40 -0000 1.1.2.6
@@ -75,5 +75,8 @@
<sect2><title>restart 2 Head 2</title>
</sect2><sect2><title>restart 3 Head 2</title>
<para>end</para>
+<para><xlink>test</xlink> <xlink uri="yyy">xxx</xlink>
<xlink>http://www.ecos.de</xlink> <xlink>ftp://ftp.dev.ecos.de</xlink>
+
+<xlink>test</xlink> <xlink uri="yyy 2">xxx 2</xlink>
<xlink>http://www.ecos.de</xlink> <xlink>ftp://ftp.dev.ecos.de</xlink></para>
</sect2></sect1></pod>
1.1.2.5 +2 -0 embperl/test/cmp/Attic/pod.asc.htm
Index: pod.asc.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/pod.asc.htm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- pod.asc.htm 2 Mar 2002 00:46:17 -0000 1.1.2.4
+++ pod.asc.htm 3 Mar 2002 20:17:40 -0000 1.1.2.5
@@ -90,6 +90,8 @@
<h2>restart 2 Head 2</h2>
<h2>restart 3 Head 2</h2>
<p>end</p>
+<p><a href="test">test</a> <a href="yyy">xxx</a> <a
href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a>
+<a href="test">test</a> <a href="yyy 2">xxx 2</a> <a
href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a></p>
</body>
</html>
1.1.2.2 +3 -0 embperl/test/cmp/Attic/pod.asc.xalan.htm
Index: pod.asc.xalan.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/pod.asc.xalan.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- pod.asc.xalan.htm 20 Sep 2001 13:28:34 -0000 1.1.2.1
+++ pod.asc.xalan.htm 3 Mar 2002 20:17:40 -0000 1.1.2.2
@@ -40,5 +40,8 @@
</ul>
<br/>
<br/>
+<p><a href="test">test</a> <a href="yyy">xxx</a> <a
href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a>
+<a href="test">test</a> <a href="yyy 2">xxx 2</a> <a
href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a></p>
+
</body>
</html>
No revision
No revision
1.24.4.50 +10 -11 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.49
retrieving revision 1.24.4.50
diff -u -r1.24.4.49 -r1.24.4.50
--- httpd.conf.src 2 Mar 2002 19:55:47 -0000 1.24.4.49
+++ httpd.conf.src 3 Mar 2002 20:17:40 -0000 1.24.4.50
@@ -333,6 +333,7 @@
<Location /cgi-bin>
Action text/html /cgi/embpcgi.test.pl
Options ExecCGI
+SetEnv EMBPERL_SESSION_HANDLER_CLASS no
</Location>
<Location /cgi-bin2>
@@ -389,6 +390,15 @@
#Options ExecCGI
#</Location>
+<Location /embperl/EmbperlObject>
+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
+</Location>
<Location /embperl/EmbperlObject/base3>
@@ -414,17 +424,6 @@
PerlHandler Embperl::Object
Options ExecCGI
</Location>
-
-<Location /embperl/EmbperlObject>
-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
-</Location>
-
<Location /embperl/SSI/>
EMBPERL_SYNTAX SSI
No revision
No revision
1.1.2.3 +29 -0 embperl/test/html/xml/Attic/pod.xsl
Index: pod.xsl
===================================================================
RCS file: /home/cvs/embperl/test/html/xml/Attic/pod.xsl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- pod.xsl 25 Feb 2002 11:20:30 -0000 1.1.2.2
+++ pod.xsl 3 Mar 2002 20:17:40 -0000 1.1.2.3
@@ -79,4 +79,33 @@
</xsl:template>
+
+ <xsl:template name="link">
+ <xsl:param name="txt"/>
+ <xsl:param name="uri"/>
+ <a href="{$uri}"><xsl:value-of select="$txt"/></a>
+ </xsl:template>
+
+
+
+ <xsl:template match="xlink">
+ <xsl:choose>
+ <xsl:when test="@uri">
+ <xsl:call-template name="link">
+ <xsl:with-param name="uri" select="@uri"/>
+ <xsl:with-param name="txt" select="."/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="link">
+ <xsl:with-param name="uri" select="."/>
+ <xsl:with-param name="txt" select="."/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:template>
+
+
+
</xsl:stylesheet>
No revision
No revision
1.1.2.22 +3 -2 embperl/xsbuilder/maps/Attic/ep_structure.map
Index: ep_structure.map
===================================================================
RCS file: /home/cvs/embperl/xsbuilder/maps/Attic/ep_structure.map,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- ep_structure.map 27 Feb 2002 11:58:26 -0000 1.1.2.21
+++ ep_structure.map 3 Mar 2002 20:17:40 -0000 1.1.2.22
@@ -81,10 +81,11 @@
<tAppConfig>
! _perlsv
sAppName | app_name
+ bUseEnv | use_env
+ bUseRedirectEnv | use_redirect_env
pSessionArgs | session_args
pSessionClasses | session_classes
sSessionConfig | session_config
-
sSessionHandlerClass | session_handler_class
sCookieName | cookie_name
sCookieDomain | cookie_domain
@@ -217,7 +218,7 @@
pPathAV | path
bDebug | debug
bOptions | options
- nSessionMode | session_mode
+ nSessionMode | session_mode
new
! private
</tReqConfig>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
