richter 02/05/27 10:53:14
Modified: . Tag: Embperl2c Embperl.pm MANIFEST Makefile.PL
epcgiinit.c epinit.c eppriv.h test.pl
Embperl Tag: Embperl2c Util.pm
test/cmp Tag: Embperl2c epobase.htm errdoc2.htm reqrec.htm
varepvar.htm
test/cmp2 Tag: Embperl2c errdoc2.htm
test/conf Tag: Embperl2c httpd.conf.src startup.pl
test/html Tag: Embperl2c errmsg2.htm
Added: . Tag: Embperl2c epdefault.c mod_embperl.c
test/html Tag: Embperl2c execviamod.htm execviamod.pm
Removed: . Tag: Embperl2c epapinit.c
Log:
Apache 2 support
Revision Changes Path
No revision
No revision
1.118.4.111 +13 -5 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.110
retrieving revision 1.118.4.111
diff -u -r1.118.4.110 -r1.118.4.111
--- Embperl.pm 24 May 2002 19:39:32 -0000 1.118.4.110
+++ Embperl.pm 27 May 2002 17:53:12 -0000 1.118.4.111
@@ -10,14 +10,16 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.118.4.110 2002/05/24 19:39:32 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.111 2002/05/27 17:53:12 richter Exp $
#
###################################################################################
package Embperl;
-
+BEGIN {
+ $ENV{PATH} ||= '' ; # avoid waring under mod_perl 2.0 which has no PATH set
+ }
require Cwd ;
@@ -42,6 +44,7 @@
%initparam
$modperl
$modperl2
+ $req
) ;
@@ -67,19 +70,20 @@
if ($modperl2)
{
+ require Apache::Server ;
require Apache::ServerUtil ;
+ require Apache::RequestRec ;
+ require Apache::RequestUtil ;
}
if (!defined(&Embperl::Init))
{
bootstrap Embperl $VERSION ;
- #print STDERR "Boot\n" ;
Boot ($VERSION) ;
- #print STDERR "Init\n" ;
Init ($modperl?Apache -> server:undef, \%initparam) ;
- #print STDERR "Init done\n" ;
}
+
$cwd = Cwd::fastcwd();
tie *Embperl::LOG, 'Embperl::Log' ;
@@ -95,6 +99,9 @@
local $SIG{__WARN__} = \&Warn ;
+ # when called inside a Embperl Request, Execute the component only
+ return Embperl::Req::ExecuteComponent ($_ep_param, @_) if ($req) ;
+
if (!ref $_ep_param)
{
Embperl::Req::ExecuteRequest (undef, { inputfile => $_ep_param, param =>
[@_]}) ;
@@ -195,6 +202,7 @@
my $dbgForm = $self -> config -> debug & Embperl::Constant::dbgForm ;
# just let CGI.pm read the multipart form data, see cgi docu
+ require Apache::compat if ($Embperl::modperl2) ; # Apache::compat is need for
CGI.pm
require CGI ;
my $cgi = new CGI ;
1.50.4.46 +4 -1 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.50.4.45
retrieving revision 1.50.4.46
diff -u -r1.50.4.45 -r1.50.4.46
--- MANIFEST 17 May 2002 14:07:01 -0000 1.50.4.45
+++ MANIFEST 27 May 2002 17:53:12 -0000 1.50.4.46
@@ -143,7 +143,6 @@
embpmsgid.pl.templ
ep.h
ep2.h
-epapinit.c
epcache.c
epcfg.h
epcgiinit.c
@@ -155,6 +154,7 @@
epcomp.c
epdat2.h
epdbg.c
+epdefault.c
epdom.c
epdom.h
epeval.c
@@ -173,6 +173,7 @@
eppublic.h
eptypes.h
eputil.c
+mod_embperl.c
test.pl
test/cmp/Execute.htm
test/cmp/allform.htm
@@ -413,6 +414,8 @@
test/html/execprint.htm
test/html/execsecond.htm
test/html/executesub.htm
+test/html/execviamod.htm
+test/html/execviamod.pm
test/html/exit.htm
test/html/exit2.htm
test/html/exit3.htm
1.31.4.56 +15 -4 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.55
retrieving revision 1.31.4.56
diff -u -r1.31.4.55 -r1.31.4.56
--- Makefile.PL 23 May 2002 22:24:45 -0000 1.31.4.55
+++ Makefile.PL 27 May 2002 17:53:12 -0000 1.31.4.56
@@ -3,7 +3,7 @@
#
# (C) 1997-2001 G.Richter ([EMAIL PROTECTED]) / ECOS
#
-# $Id: Makefile.PL,v 1.31.4.55 2002/05/23 22:24:45 richter Exp $
+# $Id: Makefile.PL,v 1.31.4.56 2002/05/27 17:53:12 richter Exp $
#
@@ -214,7 +214,16 @@
my $self = shift ;
my $txt = $self -> MM::cflags (@_) ;
- $txt =~ s/CCFLAGS\s*=/CCFLAGS = $ccdebug / ;
+
+ if ($mp2cfg)
+ { # with Apache 2, make sure we have the same defines as mod_perl
+ $txt =~ s/CCFLAGS\s*=.*?\n/CCFLAGS = $ccdebug
$mp2cfg->{MODPERL_CCOPTS}\n/s ;
+ }
+ else
+ {
+ $txt =~ s/CCFLAGS\s*=/CCFLAGS = $ccdebug / ;
+ }
+
return $txt ;
}
@@ -1210,8 +1219,10 @@
WriteMakefile(
'NAME' => 'Embperl',
'VERSION_FROM' => 'Embperl.pm', # finds $VERSION
- 'OBJECT' => 'Embperl$(OBJ_EXT) epmain$(OBJ_EXT) epio$(OBJ_EXT)
epchar$(OBJ_EXT) eputil$(OBJ_EXT) epeval$(OBJ_EXT) epapinit$(OBJ_EXT) ' .
- ($EP2?'epmem$(OBJ_EXT) epinit$(OBJ_EXT) epcgiinit$(OBJ_EXT)
epcmd2$(OBJ_EXT) epparse$(OBJ_EXT) epdom$(OBJ_EXT) epcomp$(OBJ_EXT) epcache$(OBJ_EXT)
epprovider$(OBJ_EXT)':'epcmd$(OBJ_EXT) ') . $o,
+ 'OBJECT' => 'Embperl$(OBJ_EXT) epmain$(OBJ_EXT) epio$(OBJ_EXT)
epchar$(OBJ_EXT) eputil$(OBJ_EXT) epeval$(OBJ_EXT) ' .
+ ($EP2?'epmem$(OBJ_EXT) epinit$(OBJ_EXT) epcgiinit$(OBJ_EXT)
epcmd2$(OBJ_EXT) epparse$(OBJ_EXT) epdom$(OBJ_EXT) epcomp$(OBJ_EXT) epcache$(OBJ_EXT)
epprovider$(OBJ_EXT) ':'epcmd$(OBJ_EXT) ') .
+ ($apache?'mod_embperl$(OBJ_EXT) ':' ') .
+ $o ,
'LIBS' => [$libs || ''],
'DEFINE' => "$d \$(DEFS)",
'INC' => $i,
1.1.2.17 +2 -1 embperl/Attic/epcgiinit.c
Index: epcgiinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcgiinit.c,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- epcgiinit.c 5 Mar 2002 11:05:02 -0000 1.1.2.16
+++ epcgiinit.c 27 May 2002 17:53:12 -0000 1.1.2.17
@@ -10,12 +10,13 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcgiinit.c,v 1.1.2.16 2002/03/05 11:05:02 richter Exp $
+# $Id: epcgiinit.c,v 1.1.2.17 2002/05/27 17:53:12 richter Exp $
#
###################################################################################*/
#include "ep.h"
+#include "epdefault.c"
#undef EPCFG
1.1.2.55 +8 -96 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.54
retrieving revision 1.1.2.55
diff -u -r1.1.2.54 -r1.1.2.55
--- epinit.c 24 May 2002 19:39:32 -0000 1.1.2.54
+++ epinit.c 27 May 2002 17:53:12 -0000 1.1.2.55
@@ -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.54 2002/05/24 19:39:32 richter Exp $
+# $Id: epinit.c,v 1.1.2.55 2002/05/27 17:53:12 richter Exp $
#
###################################################################################*/
@@ -20,6 +20,7 @@
#include "xs/ep_xs_typedefs.h"
#include "xs/ep_xs_sv_convert.h"
+#include "epdefault.c"
@@ -181,39 +182,6 @@
}
/*---------------------------------------------------------------------------
-* embperl_DefaultAppConfig
-*/
-/*!
-*
-* \_en
-* initialze Config defaults
-* \endif
-*
-* \_de
-* Initialisiert Config Defaults
-* \endif
-*
-* ------------------------------------------------------------------------ */
-
-
-void embperl_DefaultAppConfig (/*in*/ tAppConfig *pCfg)
-
- {
- pCfg -> sAppName = "Embperl" ;
- pCfg -> sCookieName = "EMBPERL_UID" ;
- pCfg -> sSessionHandlerClass = "Apache::SessionX" ;
-#ifdef WIN32
- pCfg -> sLog = "\\embperl.log" ;
-#else
- pCfg -> sLog = "/tmp/embperl.log" ;
-#endif
- pCfg -> bDebug = dbgStd ;
- pCfg -> nMailErrorsResetTime = 60 ;
- pCfg -> nMailErrorsResendTime = 60 * 15 ;
- }
-
-
-/*---------------------------------------------------------------------------
* embperl_CreateSessionObject
*/
/*!
@@ -711,7 +679,11 @@
/* when running under mod_perl only register the module */
/* rest will be call from module initialzation when config has been read */
embperl_ApacheAddModule () ;
+#ifdef APACHE2
+ ap_s = epxs_sv2_Apache__Server(pApacheSrvSV) ;
+#else
return ok ;
+#endif
}
#endif
@@ -723,7 +695,9 @@
#ifdef APACHE
if (ap_s)
+ {
embperl_GetApacheConfig (pThread, NULL, ap_s, &pApacheCfg) ;
+ }
#endif
if ((rc = embperl_SetupApp (aTHX_ pThread, pApacheCfg, pPerlParam, &pApp)) !=
ok)
@@ -803,30 +777,6 @@
return rc ;
}
-
-/*---------------------------------------------------------------------------
-* embperl_DefaultReqConfig
-*/
-/*!
-*
-* \_en
-* initialze ReqConfig defaults
-* \endif
-*
-* \_de
-* Initialisiert ReqConfig Defaults
-* \endif
-*
-* ------------------------------------------------------------------------ */
-
-
-void embperl_DefaultReqConfig (/*in*/ tReqConfig *pCfg)
-
- {
- pCfg -> cMultFieldSep = '\t' ;
- pCfg -> nSessionMode = smodeUDatCookie ;
- }
-
/*---------------------------------------------------------------------------
* embperl_GetFormData
@@ -1688,44 +1638,6 @@
-
-
-
-
-/*---------------------------------------------------------------------------
-* embperl_DefaultComponentConfig
-*/
-/*!
-*
-* \_en
-* initialze Config defaults
-* \endif
-*
-* \_de
-* Initialisiert Config Defaults
-* \endif
-*
-* ------------------------------------------------------------------------ */
-
-
-void embperl_DefaultComponentConfig (/*in*/ tComponentConfig *pCfg)
-
- {
- pCfg -> sPackage ;
- pCfg -> bDebug = dbgStd ;
- /* pCfg -> bOptions = optRawInput | optAllFormData ; */
- pCfg -> nEscMode = escStd ;
- pCfg -> bCacheKeyOptions = ckoptDefault ;
- pCfg -> sSyntax = "Embperl" ;
- pCfg -> sInputCharset = "iso-8859-1" ;
-#ifdef LIBXSLT
- pCfg -> sXsltproc = "libxslt" ;
-#else
-#ifdef XALAN
- pCfg -> sXsltproc = "xalan" ;
-#endif
-#endif
- }
/*---------------------------------------------------------------------------
1.1.2.19 +3 -1 embperl/Attic/eppriv.h
Index: eppriv.h
===================================================================
RCS file: /home/cvs/embperl/Attic/eppriv.h,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- eppriv.h 23 May 2002 22:24:46 -0000 1.1.2.18
+++ eppriv.h 27 May 2002 17:53:13 -0000 1.1.2.19
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eppriv.h,v 1.1.2.18 2002/05/23 22:24:46 richter Exp $
+# $Id: eppriv.h,v 1.1.2.19 2002/05/27 17:53:13 richter Exp $
#
###################################################################################*/
@@ -210,9 +210,11 @@
/* --- init --- */
+#if 0
void embperl_DefaultAppConfig (/*in*/ tAppConfig *pCfg) ;
void embperl_DefaultReqConfig (/*in*/ tReqConfig *pCfg) ;
void embperl_DefaultComponentConfig (/*in*/ tComponentConfig *pCfg) ;
+#endif
void Embperl__App_new_init(pTHX_ tApp * pApp, SV * pPerlParam, int overwrite) ;
void Embperl__App__Config_new_init(pTHX_ tAppConfig * pAppConfig, SV * pPerlParam,
int overwrite) ;
1.70.4.135 +4 -1 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.134
retrieving revision 1.70.4.135
diff -u -r1.70.4.134 -r1.70.4.135
--- test.pl 17 May 2002 13:18:55 -0000 1.70.4.134
+++ test.pl 27 May 2002 17:53:13 -0000 1.70.4.135
@@ -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.134 2002/05/17 13:18:55 richter Exp $
+# $Id: test.pl,v 1.70.4.135 2002/05/27 17:53:13 richter Exp $
#
###################################################################################
@@ -344,6 +344,9 @@
'version' => 2,
},
'execprint.htm' => {
+ 'version' => 2,
+ },
+ 'execviamod.htm' => {
'version' => 2,
},
# 'execinside.htm' => {
No revision
No revision
1.1.2.1 +112 -0 embperl/Attic/epdefault.c
1.1.2.1 +926 -0 embperl/Attic/mod_embperl.c
No revision
No revision
1.1.2.8 +3 -11 embperl/Embperl/Attic/Util.pm
Index: Util.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Util.pm,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Util.pm 28 Feb 2002 07:54:58 -0000 1.1.2.7
+++ Util.pm 27 May 2002 17:53:13 -0000 1.1.2.8
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Util.pm,v 1.1.2.7 2002/02/28 07:54:58 richter Exp $
+# $Id: Util.pm,v 1.1.2.8 2002/05/27 17:53:13 richter Exp $
#
###################################################################################
@@ -92,15 +92,6 @@
*{"$package\:\:$_"} = \@{"Embperl\:\:$_"} ;
}
- if (defined (&Apache::exit))
- {
- *{"$package\:\:exit"} = \&Apache::exit
- }
- else
- {
- *{"$package\:\:exit"} = \&Embperl::exit
- }
-
my $sess ;
$sess = $Embperl::req -> app -> udat ;
@@ -110,8 +101,9 @@
$sess = $Embperl::req -> app -> sdat ;
*{"$package\:\:sdat"} = $sess if ($sess) ;
+ *{"$package\:\:exit"} = \&Embperl::exit ;
*{"$package\:\:MailFormTo"} = \&Embperl::MailFormTo ;
- *{"$package\:\:Execute"} = \&Embperl::Req::ExecuteComponent ;
+ *{"$package\:\:Execute"} = \&Embperl::Req::ExecuteComponent ;
tie *{"$package\:\:LOG"}, 'Embperl::Log' ;
tie *{"$package\:\:OUT"}, 'Embperl::Out' ;
No revision
No revision
1.1.2.6 +1 -1 embperl/test/cmp/epobase.htm
Index: epobase.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/epobase.htm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- epobase.htm 6 Feb 2002 18:22:33 -0000 1.1.2.5
+++ epobase.htm 27 May 2002 17:53:14 -0000 1.1.2.6
@@ -3,7 +3,7 @@
<TITLE>403 Forbidden</TITLE>
</HEAD><BODY>
<H1>Forbidden</H1>
-You don't have permission to access /embperl/EmbperlObject/epobase.htm
+^.*?You don't have permission to access /embperl/EmbperlObject/epobase.htm
on this server.<P>
</BODY></HTML>
1.2.4.5 +1 -2 embperl/test/cmp/errdoc2.htm
Index: errdoc2.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/errdoc2.htm,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -u -r1.2.4.4 -r1.2.4.5
--- errdoc2.htm 31 Oct 2001 15:14:49 -0000 1.2.4.4
+++ errdoc2.htm 27 May 2002 17:53:14 -0000 1.2.4.5
@@ -9,9 +9,8 @@
main:
-^prev: Apache=SCALAR
+^prev: Apache.*?=SCALAR
next:
-^last: Apache=SCALAR
^There are 1(0|2|3|5) errormessages:
<table border=1>
1.5.4.2 +2 -2 embperl/test/cmp/reqrec.htm
Index: reqrec.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/reqrec.htm,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- reqrec.htm 6 Feb 2002 09:21:08 -0000 1.5.4.1
+++ reqrec.htm 27 May 2002 17:53:14 -0000 1.5.4.2
@@ -8,10 +8,10 @@
^\$_\[0\] = Embperl::Req=HASH\(0x.*?\) <br>
$_[1] = <br>
-^\$rec_rec = Apache=SCALAR\(0x.*?\)<br>
+^\$rec_rec = Apache(::RequestRec)?=SCALAR\(0x.*?\)<br>
^\$\$rec_rec = \d+<br>
-^Apache->request = Apache=SCALAR\(0x.*?\)<br>
+^Apache->request = Apache(::RequestRec)?=SCALAR\(0x.*?\)<br>
^\$\{Apache->request\} = \d+<br>
${Apache->request} = $$req_rec ? yes <br>
1.1.2.3 +2 -2 embperl/test/cmp/varepvar.htm
Index: varepvar.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/varepvar.htm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- varepvar.htm 10 Feb 2002 21:26:16 -0000 1.1.2.2
+++ varepvar.htm 27 May 2002 17:53:14 -0000 1.1.2.3
@@ -8,10 +8,10 @@
^\$_\[0\] = Embperl::Req=HASH\(0x.*?\) <br>
$_[1] = <br>
-^\$rec_rec = Apache=SCALAR\(0x.*?\)<br>
+^\$rec_rec = Apache(::RequestRec)?=SCALAR\(0x.*?\)<br>
^\$\$rec_rec = \d+<br>
-^Apache->request = Apache=SCALAR\(0x.*?\)<br>
+^Apache->request = Apache(::RequestRec)?=SCALAR\(0x.*?\)<br>
^\$\{Apache->request\} = \d+<br>
${Apache->request} = $$req_rec ? yes <br>
No revision
No revision
1.1.2.5 +1 -2 embperl/test/cmp2/Attic/errdoc2.htm
Index: errdoc2.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp2/Attic/errdoc2.htm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- errdoc2.htm 25 Feb 2002 11:20:29 -0000 1.1.2.4
+++ errdoc2.htm 27 May 2002 17:53:14 -0000 1.1.2.5
@@ -9,9 +9,8 @@
main:
-^prev: Apache=SCALAR
+^prev: Apache.*?=SCALAR
next:
-^last: Apache=SCALAR
^There are 4 errormessages:
<table border=1>
No revision
No revision
1.24.4.61 +6 -1 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.60
retrieving revision 1.24.4.61
diff -u -r1.24.4.60 -r1.24.4.61
--- httpd.conf.src 24 May 2002 05:43:15 -0000 1.24.4.60
+++ httpd.conf.src 27 May 2002 17:53:14 -0000 1.24.4.61
@@ -268,7 +268,12 @@
<Location /embperl/registry>
SetHandler perl-script
-PerlHandler Apache::Registry
+EOD
+
+print OFH "PerlHandler ", $MP2?'ModPerl':'Apache', "::Registry\n" ;
+
+
+print OFH <<EOD ;
Options ExecCGI
</Location>
1.9.6.16 +13 -5 embperl/test/conf/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup.pl,v
retrieving revision 1.9.6.15
retrieving revision 1.9.6.16
diff -u -r1.9.6.15 -r1.9.6.16
--- startup.pl 24 May 2002 07:25:35 -0000 1.9.6.15
+++ startup.pl 27 May 2002 17:53:14 -0000 1.9.6.16
@@ -2,10 +2,11 @@
BEGIN {
use lib qw{ . } ;
use ExtUtils::testlib ;
- use Cwd ;
- $ENV{EMBPERL_SRC} ||= '/usr/msrc/ep2a' ;
- my $cwd = $ENV{EMBPERL_SRC} ;
+
+ $ENV{EMBPERL_SRC} =~ /^(.*?)$/;
+ my $cwd = $1 ; # untaint
+ #my $cwd = '/usr/msrc/ep2a' ;
my $i = 0 ;
foreach (@INC)
{
@@ -16,20 +17,27 @@
$ENV{MOD_PERL} =~ m#/(\d+)\.(\d+)# ;
$mp2 = 1 if ($1 == 2 || ($1 == 1 && $2 >= 99)) ;
- print STDERR "Runing under modperl ", $mp2?2:1, " ($ENV{MOD_PERL})\n" ;
+ #print STDERR "Runing under modperl ", $mp2?2:1, " ($ENV{MOD_PERL})\n" ;
if (!$mp2)
{
require Apache ;
require Apache::Registry ;
}
+ else
+ {
+ require ModPerl::Registry ;
+ }
} ;
use Embperl ;
use Embperl::Object ;
-require "$ENV{EMBPERL_SRC}/test/testapp.pl" ;
+$ENV{EMBPERL_SRC} =~ /^(.*?)$/;
+my $cwd = $1 ;
+
+require "$cwd/test/testapp.pl" ;
$cp = Embperl::Util::AddCompartment ('TEST') ;
No revision
No revision
1.2.4.1 +0 -1 embperl/test/html/errmsg2.htm
Index: errmsg2.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/errmsg2.htm,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- errmsg2.htm 11 Sep 2000 09:53:36 -0000 1.2
+++ errmsg2.htm 27 May 2002 17:53:14 -0000 1.2.4.1
@@ -11,7 +11,6 @@
main: [+ $req_rec -> main +]
prev: [+ $req_rec -> prev +]
next: [+ $req_rec -> next +]
-last: [+ $req_rec -> last +]
[-
$errors = $req_rec -> prev -> pnotes('EMBPERL_ERRORS') ;
No revision
No revision
1.1.2.1 +28 -0 embperl/test/html/Attic/execviamod.htm
1.1.2.1 +26 -0 embperl/test/html/Attic/execviamod.pm
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
