You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2002/06/02 01:44:26 UTC
cvs commit: embperl/xsbuilder/maps ep_structure.map
richter 2002/06/01 16:44:26
Modified: . Tag: Embperl2c Changes.pod Embperl.pm MANIFEST
Makefile.PL embperl.h ep2.h epdat2.h epinit.c
epmain.c epprovider.c
Embperl/Recipe Tag: Embperl2c Embperl.pm
eg/web Tag: Embperl2c config.pl news.epl
test/conf Tag: Embperl2c httpd.conf.src startup.pl
xsbuilder/maps Tag: Embperl2c ep_structure.map
Added: . Tag: Embperl2c epapfilter.c
Log:
Apache 2
Revision Changes Path
No revision
No revision
1.129.4.75 +2 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.74
retrieving revision 1.129.4.75
diff -u -r1.129.4.74 -r1.129.4.75
--- Changes.pod 28 May 2002 18:58:01 -0000 1.129.4.74
+++ Changes.pod 1 Jun 2002 23:44:24 -0000 1.129.4.75
@@ -6,6 +6,8 @@
it exits the current component, like before, when called with argument
it exits the whole request.
- Added support for Apache 2.0 / mod_perl 2.0 (prefork MPM).
+ - Added the possibility to catch the output of a sub-request
+ (e.g. a CGI script, Java or PHP output) when running under Apache 2.0
- when setting $r -> param -> filename in an application object
to a relativ path it is interpreted relativ to original request
- fixed bug with setting of escmode and print Out reported by
1.118.4.113 +2 -6 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.112
retrieving revision 1.118.4.113
diff -u -r1.118.4.112 -r1.118.4.113
--- Embperl.pm 28 May 2002 06:56:03 -0000 1.118.4.112
+++ Embperl.pm 1 Jun 2002 23:44:24 -0000 1.118.4.113
@@ -10,17 +10,13 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.118.4.112 2002/05/28 06:56:03 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.113 2002/06/01 23:44:24 richter Exp $
#
###################################################################################
package Embperl;
-BEGIN {
- $ENV{PATH} ||= '' ; # avoid waring under mod_perl 2.0 which has no PATH set
- }
-
require Cwd ;
require Exporter;
@@ -50,7 +46,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '2.0b8_dev-10' ;
+$VERSION = '2.0b8_dev-12' ;
if ($modperl = $ENV{MOD_PERL})
1.50.4.49 +1 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.50.4.48
retrieving revision 1.50.4.49
diff -u -r1.50.4.48 -r1.50.4.49
--- MANIFEST 28 May 2002 06:59:51 -0000 1.50.4.48
+++ MANIFEST 1 Jun 2002 23:44:24 -0000 1.50.4.49
@@ -143,6 +143,7 @@
embpmsgid.pl.templ
ep.h
ep2.h
+epapfilter.c
epcache.c
epcfg.h
epcgiinit.c
1.31.4.57 +2 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.56
retrieving revision 1.31.4.57
diff -u -r1.31.4.56 -r1.31.4.57
--- Makefile.PL 27 May 2002 17:53:12 -0000 1.31.4.56
+++ Makefile.PL 1 Jun 2002 23:44:24 -0000 1.31.4.57
@@ -3,7 +3,7 @@
#
# (C) 1997-2001 G.Richter (richter@dev.ecos.de) / ECOS
#
-# $Id: Makefile.PL,v 1.31.4.56 2002/05/27 17:53:12 richter Exp $
+# $Id: Makefile.PL,v 1.31.4.57 2002/06/01 23:44:24 richter Exp $
#
@@ -1222,6 +1222,7 @@
'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) ':' ') .
+ ($mp2cfg?'epapfilter$(OBJ_EXT) ':' ') .
$o ,
'LIBS' => [$libs || ''],
'DEFINE' => "$d \$(DEFS)",
1.19.4.28 +2 -1 embperl/embperl.h
Index: embperl.h
===================================================================
RCS file: /home/cvs/embperl/embperl.h,v
retrieving revision 1.19.4.27
retrieving revision 1.19.4.28
diff -u -r1.19.4.27 -r1.19.4.28
--- embperl.h 21 Mar 2002 05:37:50 -0000 1.19.4.27
+++ embperl.h 1 Jun 2002 23:44:25 -0000 1.19.4.28
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: embperl.h,v 1.19.4.27 2002/03/21 05:37:50 richter Exp $
+# $Id: embperl.h,v 1.19.4.28 2002/06/01 23:44:25 richter Exp $
#
###################################################################################*/
@@ -90,6 +90,7 @@
rcCannotCheckUri,
rcSetupSessionErr,
rcRefcntNotOne,
+ rcApacheErr,
rcForbidden = 403,
rcNotFound = 404,
rcDecline = -1
1.1.2.32 +4 -1 embperl/Attic/ep2.h
Index: ep2.h
===================================================================
RCS file: /home/cvs/embperl/Attic/ep2.h,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- ep2.h 27 Feb 2002 11:58:23 -0000 1.1.2.31
+++ ep2.h 1 Jun 2002 23:44:25 -0000 1.1.2.32
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: ep2.h,v 1.1.2.31 2002/02/27 11:58:23 richter Exp $
+# $Id: ep2.h,v 1.1.2.32 2002/06/01 23:44:25 richter Exp $
#
###################################################################################*/
@@ -273,6 +273,9 @@
/*in*/ SV * pParam,
/*in*/ IV nParamIndex) ;
+#ifdef APACHE2
+int ApFilter_Init (/*in*/ tApp * a) ;
+#endif
/* --- from epinit.c --- */
1.1.2.34 +7 -6 embperl/Attic/epdat2.h
Index: epdat2.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdat2.h,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- epdat2.h 10 Mar 2002 20:27:17 -0000 1.1.2.33
+++ epdat2.h 1 Jun 2002 23:44:25 -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: epdat2.h,v 1.1.2.33 2002/03/10 20:27:17 richter Exp $
+# $Id: epdat2.h,v 1.1.2.34 2002/06/01 23:44:25 richter Exp $
#
###################################################################################*/
@@ -162,13 +162,14 @@
typedef struct tComponentParam
{
- SV * _perlsv ; /**< The perl reference to this structure */
- tMemPool * pPool ; /**< pool for memorymanagement */
- char * sInputfile ;
- char * sOutputfile ;
+ SV * _perlsv ; /**< The perl reference to this structure */
+ tMemPool * pPool ; /**< pool for memorymanagement */
+ char * sInputfile ; /**< name of sourcefile */
+ char * sOutputfile ; /**< name of outputfile */
+ char * sSubreq ; /**< sub request uri */
SV * pInput ;
SV * pOutput ;
- char * sSub ; /* subroutine to call */
+ char * sSub ; /* subroutine to call */
int nImport ;
char * sObject ; /**< create an object */
char * sISA ; /**< make this a base class */
1.1.2.56 +4 -1 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.55
retrieving revision 1.1.2.56
diff -u -r1.1.2.55 -r1.1.2.56
--- epinit.c 27 May 2002 17:53:12 -0000 1.1.2.55
+++ epinit.c 1 Jun 2002 23:44:25 -0000 1.1.2.56
@@ -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.55 2002/05/27 17:53:12 richter Exp $
+# $Id: epinit.c,v 1.1.2.56 2002/06/01 23:44:25 richter Exp $
#
###################################################################################*/
@@ -763,6 +763,9 @@
DomInit (pApp) ;
Cache_Init (pApp) ;
Provider_Init (pApp) ;
+#ifdef APACHE2
+ ApFilter_Init (pApp) ;
+#endif
#ifdef XALAN
embperl_Xalan_Init () ;
#endif
1.75.4.121 +8 -6 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.120
retrieving revision 1.75.4.121
diff -u -r1.75.4.120 -r1.75.4.121
--- epmain.c 28 May 2002 06:56:03 -0000 1.75.4.120
+++ epmain.c 1 Jun 2002 23:44:25 -0000 1.75.4.121
@@ -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.120 2002/05/28 06:56:03 richter Exp $
+# $Id: epmain.c,v 1.75.4.121 2002/06/01 23:44:25 richter Exp $
#
###################################################################################*/
@@ -175,6 +175,7 @@
case rcCannotCheckUri: msg ="[%d]ERR: %d: %s Cannot check URI against ALLOW and/or URIMATCH because URI is unknown" ; break ;
case rcSetupSessionErr: msg ="[%d]ERR: %d: %s Embperl Session handling DISABLED because of the following error: %s\nSet EMBPERL_SESSION_HANDLER_CLASS to 'no' to avoid this message. %s" ; break ;
case rcRefcntNotOne: msg ="[%d]ERR: %d: %s There is still %s reference(s) to the %s object, while there shouldn't be any." ; break ;
+ case rcApacheErr: msg ="[%d]ERR: %d: %s Apache returns Error: %s %s" ; break ;
default: msg ="[%d]ERR: %d: %s Error (no description) %s %s" ; break ;
}
@@ -1440,11 +1441,6 @@
if (rc == ok && (c -> Config.bOptions & optReturnError) && r -> bError)
rc = 500 ;
- /* --- Restore Operatormask and Package, destroy temp perl sv's --- */
- FREETMPS ;
- LEAVE;
- c -> bReqRunning = 0 ;
-
if (!r -> bError)
{
@@ -1460,6 +1456,12 @@
OutputToFile (r) ;
}
}
+
+ /* --- Restore Operatormask and Package, destroy temp perl sv's --- */
+ FREETMPS ;
+ LEAVE;
+ c -> bReqRunning = 0 ;
+
return rc ;
}
1.1.2.36 +4 -3 embperl/Attic/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epprovider.c,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -u -r1.1.2.35 -r1.1.2.36
--- epprovider.c 28 May 2002 06:56:04 -0000 1.1.2.35
+++ epprovider.c 1 Jun 2002 23:44:25 -0000 1.1.2.36
@@ -1,15 +1,16 @@
/*###################################################################################
#
-# Embperl - Copyright (c) 1997-2001 Gerald Richter / ECOS
+# Embperl - Copyright (c) 1997-2002 Gerald Richter / ecos gmbh www.ecos.de
#
# You may distribute under the terms of either the GNU General Public
# License or the Artistic License, as specified in the Perl README file.
+# For use with Apache httpd and mod_perl, see also Apache copyright.
#
# THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epprovider.c,v 1.1.2.35 2002/05/28 06:56:04 richter Exp $
+# $Id: epprovider.c,v 1.1.2.36 2002/06/01 23:44:25 richter Exp $
#
###################################################################################*/
@@ -479,7 +480,7 @@
/* ------------------------------------------------------------------------ */
/* */
-/*! Provider that reads input from file */
+/*! Provider that reads input from memory */
/* */
typedef struct tProviderMem
No revision
No revision
1.1.2.1 +403 -0 embperl/Attic/epapfilter.c
No revision
No revision
1.1.2.20 +2 -2 embperl/Embperl/Recipe/Attic/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/Embperl.pm,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- Embperl.pm 13 Mar 2002 06:29:36 -0000 1.1.2.19
+++ Embperl.pm 1 Jun 2002 23:44:26 -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: Embperl.pm,v 1.1.2.19 2002/03/13 06:29:36 richter Exp $
+# $Id: Embperl.pm,v 1.1.2.20 2002/06/01 23:44:26 richter Exp $
#
###################################################################################
@@ -40,7 +40,7 @@
if (!$src)
{
- push @recipe, {'type' => ref ($param -> input)?'memory':'file' } ;
+ push @recipe, {'type' => ref ($param -> input)?'memory':($param -> subreq?'apoutfilter':'file') } ;
}
else
{
No revision
No revision
1.1.2.7 +22 -11 embperl/eg/web/Attic/config.pl
Index: config.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/config.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- config.pl 27 Feb 2002 15:42:50 -0000 1.1.2.6
+++ config.pl 1 Jun 2002 23:44:26 -0000 1.1.2.7
@@ -1,4 +1,26 @@
+
+
+sub new
+ {
+ my ($self, $r) = @_ ;
+
+ # The following two values must be changed to meet your local setup
+ # Additionaly DBI and DBIx::Recordset must be installed
+
+ $r -> {dbdsn} = $^O eq 'MSWin32'?'dbi:ODBC:embperl':'dbi:mysql:embperl' ;
+ $r -> {dbuser} = 'www' ;
+
+ # There is normaly no need to change anything below this line
+
+ $r -> {imageuri} = '/eg/images/' ;
+ $r -> {baseuri} = '/eg/web/' ;
+ $r -> {root} = $ENV{EMBPERL_SRC} ;
+ }
+
+
+
+
BEGIN
{
%messages = (
@@ -73,17 +95,6 @@
} ;
-
-sub new
- {
- my ($self, $r) = @_ ;
-
- $r -> {imageuri} = '/eg/images/' ;
- $r -> {baseuri} = '/eg/web/' ;
- $r -> {root} = $^O eq 'MSWin32'?'/perl/msrc/ep2a/':'/usr/msrc/ep2a/' ;
- $r -> {dbdsn} = $^O eq 'MSWin32'?'dbi:ODBC:embperl':'dbi:mysql:embperl' ;
- $r -> {dbuser} = 'www' ;
- }
1.1.2.2 +83 -44 embperl/eg/web/Attic/news.epl
Index: news.epl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/news.epl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- news.epl 13 Feb 2002 05:26:30 -0000 1.1.2.1
+++ news.epl 1 Jun 2002 23:44:26 -0000 1.1.2.2
@@ -1,18 +1,28 @@
[-
-use DBIx::Recordset ;
-
$r = shift ;
+$dberr = '' ;
+
+eval { require DBIx::Recordset ; } ;
+
+$dberr = "DBI and DBIx::Recordset must be installed: $@" if ($@) ;
+
+if (!$dberr)
+ {
+ *set = DBIx::Recordset -> Search ({'!DataSource' => $r -> {dbdsn},
+ '!Username' => $r -> {dbuser},
+ '!Password' => $r -> {dbpassword},
+ '!DBIAttr' => { RaiseError => 1, PrintError => 1, LongReadLen => 32765, LongTruncOk => 0, },
+ '!Table' => 'item, itemtext',
+ '!TabRelation' => 'item_id = item.id',
+ '!Order' => 'creationtime desc',
+ 'language_id' => $r -> param -> language,
+ 'category_id' => 1,
+ '$max' => 15}) ;
+
+ $dberr = "Error accessing $r->{dbdsn}: " . DBIx::Recordset -> LastError if (DBIx::Recordset -> LastError) ;
+ }
+
-*set = DBIx::Recordset -> Search ({'!DataSource' => $r -> {dbdsn},
- '!Username' => $r -> {dbuser},
- '!Password' => $r -> {dbpassword},
- '!DBIAttr' => { RaiseError => 1, PrintError => 1, LongReadLen => 32765, LongTruncOk => 0, },
- '!Table' => 'item, itemtext',
- '!TabRelation' => 'item_id = item.id',
- '!Order' => 'creationtime desc',
- 'language_id' => $r -> param -> language,
- 'category_id' => 1,
- '$max' => 15}) ;
-]
@@ -26,38 +36,67 @@
<tr>
<td>
- [$while ($rec = $set -> Next)$]
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td bgcolor="#327EA7"><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>
- <font color="#FFFFFF">
- [+ $rec -> {heading} +]
- </font></b></font></td>
- </tr>
- <tr>
- <td bgcolor="#C2D9E5"><img src="[+ $r -> {imageuri} +]/linie-news.gif" width="152" height="4"/></td>
- </tr>
- <tr>
- <td bgcolor="#D2E9F5">
- <table width="100%" border="0" cellspacing="0" cellpadding="3">
- <tr>
- <td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">
- [-
- $txt = $rec -> {description} ;
- $txt =~ s#<#<#g ;
- $txt =~ s#>#>#g ;
- $txt =~ s#B<(.*?)>#<B>$1</B>#g ;
- $txt =~ s#(http://[-a-zA-Z.]+)#<A HREF="$1">$1</A>#g ;
- -]
- [+ do { local $escmode = 0 ; $txt } +]
- </font></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- [$endwhile $]
-
+ [$if !$dberr $]
+ [$while ($rec = $set -> Next)$]
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td bgcolor="#327EA7"><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>
+ <font color="#FFFFFF">
+ [+ $rec -> {heading} +]
+ </font></b></font></td>
+ </tr>
+ <tr>
+ <td bgcolor="#C2D9E5"><img src="[+ $r -> {imageuri} +]/linie-news.gif" width="152" height="4"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#D2E9F5">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3">
+ <tr>
+ <td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">
+ [-
+ $txt = $rec -> {description} ;
+ $txt =~ s#<#<#g ;
+ $txt =~ s#>#>#g ;
+ $txt =~ s#B<(.*?)>#<B>$1</B>#g ;
+ $txt =~ s#(http://[-a-zA-Z.]+)#<A HREF="$1">$1</A>#g ;
+ -]
+ [+ do { local $escmode = 0 ; $txt } +]
+ </font></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ [$endwhile $]
+ [$else$]
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td bgcolor="#327EA7"><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>
+ <font color="#FFFFFF">
+ News not available because database is not correctly setup
+ </font></b></font></td>
+ </tr>
+ <tr>
+ <td bgcolor="#C2D9E5"><img src="[+ $r -> {imageuri} +]/linie-news.gif" width="152" height="4"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="#D2E9F5">
+ <table width="100%" border="0" cellspacing="0" cellpadding="3">
+ <tr>
+ <td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">
+ [+ $dberr +]<br>
+ To get the database related parts working, go to install
+ DBI and DBIx::Recordset, setup a database for Embperl, create tables by
+ running eg/webutil/setupdb.pl (make sure to edit the DSN inside the
+ script first) and enter the correct DSN in eg/web/config.pl.
+ </font></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
+ [$endif$]
</td>
</tr>
</table>
No revision
No revision
1.24.4.63 +6 -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.62
retrieving revision 1.24.4.63
diff -u -r1.24.4.62 -r1.24.4.63
--- httpd.conf.src 28 May 2002 18:58:01 -0000 1.24.4.62
+++ httpd.conf.src 1 Jun 2002 23:44:26 -0000 1.24.4.63
@@ -34,6 +34,8 @@
print OFH "$EPMODPERL\n" ;
print OFH "LoadModule embperl_module \"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
+print OFH "PerlPassEnv PATH\n" if ($MP2) ;
+print OFH "PerlPassEnv PERL5LIB\n" if ($MP2) ;
print OFH <<EOD ;
@@ -514,6 +516,10 @@
SetHandler perl-script
PerlHandler Embperl
Options ExecCGI FollowSymLinks
+EMBPERL_INPUT_ESCMODE 7
+EMBPERL_SYNTAX "Embperl III::RandomTag"
+EMBPERL_OPTIONS 262288
+
</Location>
<Location /eg/web>
1.9.6.17 +8 -3 embperl/test/conf/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup.pl,v
retrieving revision 1.9.6.16
retrieving revision 1.9.6.17
diff -u -r1.9.6.16 -r1.9.6.17
--- startup.pl 27 May 2002 17:53:14 -0000 1.9.6.16
+++ startup.pl 1 Jun 2002 23:44:26 -0000 1.9.6.17
@@ -2,7 +2,15 @@
BEGIN {
use lib qw{ . } ;
use ExtUtils::testlib ;
+
+ $ENV{MOD_PERL} =~ m#/(\d+)\.(\d+)# ;
+ $mp2 = 1 if ($1 == 2 || ($1 == 1 && $2 >= 99)) ;
+ if ($mp2 && $ENV{PERL5LIB})
+ {
+ $ENV{PERL5LIB} =~ /^(.*)$/ ;
+ eval 'use lib split (/:/, $1) ;' ;
+ }
$ENV{EMBPERL_SRC} =~ /^(.*?)$/;
my $cwd = $1 ; # untaint
@@ -15,9 +23,6 @@
}
- $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" ;
if (!$mp2)
{
No revision
No revision
1.1.2.28 +16 -15 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.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- ep_structure.map 28 May 2002 06:56:05 -0000 1.1.2.27
+++ ep_structure.map 1 Jun 2002 23:44:26 -0000 1.1.2.28
@@ -198,21 +198,22 @@
<tComponentParam>
! _perlsv
- sInputfile | inputfile
- sOutputfile | outputfile
- pInput | input
- pOutput | output
- sSub | sub
- nImport | import
- nFirstLine | firstline
- nMtime | mtime
- pParam | param
- pFormHash | fdat
- pFormArray | ffld
- sObject | object
- sISA | isa
- pErrArray | errors
- pXsltParam | xsltparam
+ sInputfile | inputfile
+ sOutputfile | outputfile
+ sSubreq | subreq
+ pInput | input
+ pOutput | output
+ sSub | sub
+ nImport | import
+ nFirstLine | firstline
+ nMtime | mtime
+ pParam | param
+ pFormHash | fdat
+ pFormArray | ffld
+ sObject | object
+ sISA | isa
+ pErrArray | errors
+ pXsltParam | xsltparam
new
! private
</tComponentParam>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org