richter 02/03/10 12:27:20
Modified: . Tag: Embperl2c Changes.pod README.v2 embperl.h
epapinit.c epcfg.h epdat2.h epinit.c epmain.c
test.pl
Embperl Tag: Embperl2c Constant.pm
Embperl/Syntax Tag: Embperl2c SSI.pm
test/conf Tag: Embperl2c httpd.conf.src
test/html/registry Tag: Embperl2c Execute.htm tied.htm
xsbuilder/maps Tag: Embperl2c ep_structure.map
Added: test/cmp Tag: Embperl2c includeerrbt.htm
test/html Tag: Embperl2c includeerrbt.htm
Log:
destroy methods
Revision Changes Path
No revision
No revision
1.129.4.50 +8 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.49
retrieving revision 1.129.4.50
diff -u -r1.129.4.49 -r1.129.4.50
--- Changes.pod 5 Mar 2002 12:46:01 -0000 1.129.4.49
+++ Changes.pod 10 Mar 2002 20:27:17 -0000 1.129.4.50
@@ -38,6 +38,12 @@
PerlModule Embperl
AddModule embperl.c
+ - Added form data validation. Embperl is now capable to do server-side
+ and client-side validation of form input. You just have to define
+ a set of rules and Embperl generates the correct JavaScript code and
+ does the validation when the form data is posted to the server. By
+ writing or overriding class, the validatior could be extented.
+ See Embperl::Form::Validate for details.
- Added [= foo =] block and $r -> gettext method for page localization.
When the page is executed the 'foo' is replaced with a localizied
message for the current language.
@@ -61,6 +67,8 @@
- exit works now outside of [$ sub $]
- New configuration directive EMBPERL_SESSION_MODE allows
to configure to pass session inside of the QUERY_STRING
+ - Embperl doesn't add's a \r\n at the end of textfiles
+ anymore.
=head1 2.0b5 (BETA) 27. Nov. 2001
1.1.4.25 +16 -3 embperl/Attic/README.v2
Index: README.v2
===================================================================
RCS file: /home/cvs/embperl/Attic/README.v2,v
retrieving revision 1.1.4.24
retrieving revision 1.1.4.25
diff -u -r1.1.4.24 -r1.1.4.25
--- README.v2 5 Mar 2002 12:46:02 -0000 1.1.4.24
+++ README.v2 10 Mar 2002 20:27:17 -0000 1.1.4.25
@@ -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.24 2002/03/05 12:46:02 richter Exp $
+$Id: README.v2,v 1.1.4.25 2002/03/10 20:27:17 richter Exp $
### !! IMPORTANT !! IMPORTANT !! IMPORTANT !! IMPORTANT !! IMPORTANT !!
@@ -312,8 +312,8 @@
to get the old behaviour.
-Overview Embperl objects
-------------------------
+Overview Embperl objects and their methods
+------------------------------------------
* Application object
@@ -329,6 +329,9 @@
sdat
mdat
debug
+ errors_count
+ errors_last_time
+ errors_last_send_time
* Application configuration
@@ -350,6 +353,9 @@
mailfrom
maildebug
mail_errors_to
+ mail_errors_limit
+ mail_errors_reset_time
+ mail_errors_resend_time
object_base
object_app
object_addpath
@@ -461,6 +467,8 @@
debug
options
escmode
+ input_escmode
+ input_charset
ep1compat
cache_key
cache_key_options
@@ -503,6 +511,8 @@
DEBUG
OPTIONS
ESCMODE
+INPUT_ESCMODE
+INPUT_CHARSET
CACKE_KEY
CACHE_KEY_OPTIONS
EXPIRES_FUNC
@@ -546,6 +556,9 @@
MAILHELO
MAILFROM
MAIL_ERRORS_TO
+MAIL_ERRORS_LIMIT
+MAIL_ERRORS_RESET_TIME
+MAIL_ERRORS_RESEND_TIME
OBJECT_BASE
OBJECT_APP
OBJECT_ADDPATH
1.19.4.25 +2 -1 embperl/embperl.h
Index: embperl.h
===================================================================
RCS file: /home/cvs/embperl/embperl.h,v
retrieving revision 1.19.4.24
retrieving revision 1.19.4.25
diff -u -r1.19.4.24 -r1.19.4.25
--- embperl.h 5 Mar 2002 11:10:58 -0000 1.19.4.24
+++ embperl.h 10 Mar 2002 20:27:17 -0000 1.19.4.25
@@ -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.24 2002/03/05 11:10:58 richter Exp $
+# $Id: embperl.h,v 1.19.4.25 2002/03/10 20:27:17 richter Exp $
#
###################################################################################*/
@@ -89,6 +89,7 @@
rcUnknownSyntax,
rcCannotCheckUri,
rcSetupSessionErr,
+ rcRefcntNotOne,
rcForbidden = 401,
rcNotFound = 404,
rcDecline = -1
1.1.2.27 +10 -1 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- epapinit.c 4 Mar 2002 11:44:49 -0000 1.1.2.26
+++ epapinit.c 10 Mar 2002 20:27:17 -0000 1.1.2.27
@@ -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.26 2002/03/04 11:44:49 richter Exp $
+# $Id: epapinit.c,v 1.1.2.27 2002/03/10 20:27:17 richter Exp $
#
###################################################################################*/
@@ -129,12 +129,18 @@
void embperl_ApacheAddModule ()
{
+ dTHX ;
+ fprintf ((FILE *)stderr, "add module\n") ;
if (!ap_find_linked_module("embperl.c"))
{
embperl_module.name = "embperl.c" ;
+#ifdef WIN32
+ ap_add_module (&embperl_module) ;
+#else
ap_add_loaded_module (&embperl_module) ;
/* avoid warning when using AddModule */
ap_remove_module (&embperl_module) ;
+#endif
}
}
@@ -145,6 +151,7 @@
pool * subpool = ap_make_sub_pool(p);
dTHX ;
+ fprintf (stderr, "init module\n") ;
ap_register_cleanup(subpool, NULL, embperl_ApacheInitCleanup,
embperl_ApacheInitCleanup);
ap_add_version_component ("Embperl/"VERSION) ;
@@ -157,6 +164,8 @@
static void embperl_ApacheInitCleanup (void * p)
{
+ dTHX ;
+ fprintf ((FILE *)stderr, "cleanup module\n") ;
/* make sure embperl module is removed before mod_perl */
ap_remove_module (&embperl_module) ;
}
1.1.2.13 +5 -0 embperl/Attic/epcfg.h
Index: epcfg.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epcfg.h,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- epcfg.h 5 Mar 2002 08:07:20 -0000 1.1.2.12
+++ epcfg.h 10 Mar 2002 20:27:17 -0000 1.1.2.13
@@ -12,6 +12,8 @@
EPCFG_INT (ComponentConfig, unsigned, bDebug, DEBUG)
EPCFG_INT (ComponentConfig, unsigned, bOptions, OPTIONS)
EPCFG_INT (ComponentConfig, int , nEscMode, ESCMODE)
+EPCFG_INT (ComponentConfig, int , nInputEscMode, INPUT_ESCMODE)
+EPCFG_STR (ComponentConfig, char *, sInputCharset, INPUT_CHARSET)
EPCFG_STR (ComponentConfig, char *, sCacheKey, CACKE_KEY)
EPCFG_INT (ComponentConfig, unsigned, bCacheKeyOptions, CACHE_KEY_OPTIONS)
EPCFG_CV (ComponentConfig, CV * , pExpiredFunc, EXPIRES_FUNC)
@@ -57,6 +59,9 @@
EPCFG_STR(AppConfig, char *, sMailhelo, MAILHELO)
EPCFG_STR(AppConfig, char *, sMailfrom, MAILFROM)
EPCFG_STR(AppConfig, char *, sMailErrorsTo, MAIL_ERRORS_TO)
+EPCFG_INT(AppConfig, int, nMailErrorsLimit, MAIL_ERRORS_LIMIT)
+EPCFG_INT(AppConfig, int, nMailErrorsResetTime, MAIL_ERRORS_RESET_TIME)
+EPCFG_INT(AppConfig, int, nMailErrorsResendTime,
MAIL_ERRORS_RESEND_TIME)
EPCFG_STR(AppConfig, char *, sObjectBase, OBJECT_BASE)
EPCFG_STR(AppConfig, char *, sObjectApp, OBJECT_APP)
EPCFG_AV (AppConfig, AV *, pObjectAddpathAV, OBJECT_ADDPATH, SEPARATOR)
1.1.2.33 +11 -1 embperl/Attic/epdat2.h
Index: epdat2.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdat2.h,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -r1.1.2.32 -r1.1.2.33
--- epdat2.h 5 Mar 2002 08:07:20 -0000 1.1.2.32
+++ epdat2.h 10 Mar 2002 20:27:17 -0000 1.1.2.33
@@ -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.32 2002/03/05 08:07:20 richter Exp $
+# $Id: epdat2.h,v 1.1.2.33 2002/03/10 20:27:17 richter Exp $
#
###################################################################################*/
@@ -78,6 +78,8 @@
unsigned bOptions ;
int nCleanup ;
int nEscMode ;
+ int nInputEscMode ;
+ char * sInputCharset ;
int bEP1Compat;
char * sCacheKey ;
unsigned bCacheKeyOptions;
@@ -145,6 +147,9 @@
char * sMailfrom ;
bool bMaildebug ;
char * sMailErrorsTo ;
+ int nMailErrorsLimit ;
+ int nMailErrorsResetTime ;
+ int nMailErrorsResendTime ;
char * sObjectBase ;
char * sObjectApp ;
AV * pObjectAddpathAV ;
@@ -220,6 +225,11 @@
SV * pStateObj ; /**< Session State object */
HV * pAppHash ; /**< Session Application data */
SV * pAppObj ; /**< Session Application object */
+
+ int nErrorsCount ; /**< Number of errors */
+ int nErrorsLastTime ; /**< Time last error has occured */
+ int nErrorsLastSendTime ;/**< Time last error was send via mail */
+
} tApp ;
1.1.2.38 +53 -10 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -u -r1.1.2.37 -r1.1.2.38
--- epinit.c 5 Mar 2002 11:05:02 -0000 1.1.2.37
+++ epinit.c 10 Mar 2002 20:27:17 -0000 1.1.2.38
@@ -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.37 2002/03/05 11:05:02 richter Exp $
+# $Id: epinit.c,v 1.1.2.38 2002/03/10 20:27:17 richter Exp $
#
###################################################################################*/
@@ -1402,6 +1402,12 @@
CloseOutput (r, pOutput) ;
+ if (SvREFCNT(pOutput -> _perlsv) != 1)
+ {
+ char buf[20] ;
+ sprintf (buf, "%d", SvREFCNT(pOutput -> _perlsv)) ;
+ LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.component.output") ;
+ }
SvREFCNT_dec (pOutput -> _perlsv) ;
ep_destroy_pool (pOutput -> pPool) ;
@@ -1457,6 +1463,24 @@
embperl_CleanupOutput (r, c) ;
+ if (SvREFCNT(c -> Config._perlsv) != 1)
+ {
+ char buf[20] ;
+ sprintf (buf, "%d", SvREFCNT(c -> Config._perlsv)) ;
+ LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.component.config") ;
+ }
+ if (SvREFCNT(c -> Param._perlsv) != 1)
+ {
+ char buf[20] ;
+ sprintf (buf, "%d", SvREFCNT(c -> Param._perlsv)) ;
+ LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.component.param") ;
+ }
+ if (SvREFCNT(c -> _perlsv) != 1)
+ {
+ char buf[20] ;
+ sprintf (buf, "%d", SvREFCNT(c -> _perlsv)) ;
+ LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.component") ;
+ }
SvREFCNT_dec (c -> Config._perlsv) ;
SvREFCNT_dec (c -> Param._perlsv) ;
SvREFCNT_dec (c -> _perlsv) ;
@@ -1514,11 +1538,6 @@
tApp * pApp = r -> pApp ;
dSP ;
- sv_setsv(r -> pThread -> pReqRV, &sv_undef) ;
-
- while (r -> Component._perlsv)
- embperl_CleanupComponent(&r -> Component) ;
-
hv_iterinit (r -> pCleanupPackagesHV) ;
while ((pEntry = hv_iternext (r -> pCleanupPackagesHV)))
@@ -1526,9 +1545,12 @@
char * sPackage = hv_iterkey (pEntry, &l) ;
ClearSymtab (r, sPackage, r -> Config.bDebug & dbgShowCleanup) ;
}
- SvREFCNT_dec (r -> pCleanupPackagesHV) ;
+ sv_setsv(r -> pThread -> pReqRV, &sv_undef) ;
+ while (r -> Component._perlsv)
+ embperl_CleanupComponent(&r -> Component) ;
+
if (r -> nSessionMgnt)
{
PUSHMARK(sp);
@@ -1556,13 +1578,34 @@
{
sv_setsv (SvRV(*av_fetch (r -> pCleanupAV, i, 0)), &sv_undef) ;
}
- SvREFCNT_dec (r -> pCleanupAV) ;
-
Cache_CleanupRequest (r) ;
+ if (SvREFCNT(r -> Config._perlsv) != 1)
+ {
+ char buf[20] ;
+ sprintf (buf, "%d", SvREFCNT(r -> Config._perlsv)) ;
+ LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.config") ;
+ }
+ if (SvREFCNT(r -> Param._perlsv) != 1)
+ {
+ char buf[20] ;
+ sprintf (buf, "%d", SvREFCNT(r -> Param._perlsv)) ;
+ LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request.param") ;
+ }
+ if (SvREFCNT(r -> _perlsv) != 1)
+ {
+ char buf[20] ;
+ sprintf (buf, "%d", SvREFCNT(r -> _perlsv)) ;
+ LogErrorParam (r -> pApp, rcRefcntNotOne, buf, "request") ;
+ }
SvREFCNT_dec (r -> Config._perlsv) ;
SvREFCNT_dec (r -> Param._perlsv) ;
+
+ /* cleanup errarray manualy, to avoid segv incase error in destroy */
+ SvREFCNT_dec (r -> pErrArray) ;
+ r -> pErrArray = NULL ;
+
SvREFCNT_dec (r -> _perlsv) ;
ep_destroy_pool (r -> pPool) ;
@@ -1659,7 +1702,7 @@
pPool = ep_make_sub_pool (r -> pPool) ;
-
epxs_Embperl__Req_create_obj(pOutput,pSV,pRV,ep_palloc(pPool,sizeof(tComponentOutput)))
;
+
epxs_Embperl__Component__Output_create_obj(pOutput,pSV,pRV,ep_palloc(pPool,sizeof(tComponentOutput)))
;
pOutput -> pPool = pPool ;
c -> pOutput = pOutput ;
1.75.4.110 +2 -4 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.109
retrieving revision 1.75.4.110
diff -u -r1.75.4.109 -r1.75.4.110
--- epmain.c 5 Mar 2002 08:07:21 -0000 1.75.4.109
+++ epmain.c 10 Mar 2002 20:27:17 -0000 1.75.4.110
@@ -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.109 2002/03/05 08:07:21 richter Exp $
+# $Id: epmain.c,v 1.75.4.110 2002/03/10 20:27:17 richter Exp $
#
###################################################################################*/
@@ -190,6 +190,7 @@
case rcDecline: msg ="[%d]ERR: %d: %s Decline for
'%s'" ; break ;
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_CASSS 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 ;
default: msg ="[%d]ERR: %d: %s Error (no description)
%s %s" ; break ;
}
@@ -1011,8 +1012,6 @@
Node_toString (r, pDomTree, pDomTree -> xDocument, 0) ;
}
- if (!r -> Component.Config.bEP1Compat)
- oputs (r, "\r\n") ;
l = GetContentLength (r) + 1 ;
sv_setpv (pOut, "") ;
@@ -1050,7 +1049,6 @@
{
tDomTree * pDomTree = DomTree_self (r -> Component.xCurrDomTree) ;
Node_toString (r, pDomTree, pDomTree -> xDocument, 0) ;
- oputs (r, "\r\n") ;
}
}
return ok ;
1.70.4.125 +25 -5 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.124
retrieving revision 1.70.4.125
diff -u -r1.70.4.124 -r1.70.4.125
--- test.pl 5 Mar 2002 11:05:02 -0000 1.70.4.124
+++ test.pl 10 Mar 2002 20:27:18 -0000 1.70.4.125
@@ -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.124 2002/03/05 11:05:02 richter Exp $
+# $Id: test.pl,v 1.70.4.125 2002/03/10 20:27:18 richter Exp $
#
###################################################################################
@@ -276,6 +276,10 @@
'errors' => 1,
'version' => 2,
},
+ 'includeerrbt.htm' => {
+ 'errors' => 3,
+ 'version' => 2,
+ },
'incif.htm' => {
'version' => 2,
},
@@ -877,7 +881,15 @@
'modperl' => 1,
'aliasdir' => 1,
'msg' => ' libxslt',
- 'condition' => '$LIBXSLTVERSION',
+ 'condition' => '$LIBXSLTVERSION && !$EPWIN32',
+ },
+ 'asclibxslt/pod.asc' => {
+ 'version' => 2,
+ 'cmpext' => '.htm.win32',
+ 'modperl' => 1,
+ 'aliasdir' => 1,
+ 'msg' => ' libxslt',
+ 'condition' => '$LIBXSLTVERSION && $EPWIN32',
},
'ascxalan/pod.asc' => {
'version' => 2,
@@ -885,7 +897,15 @@
'modperl' => 1,
'aliasdir' => 1,
'msg' => ' xalan',
- 'condition' => '$XALANPATH',
+ 'condition' => '$XALANPATH && !$EPWIN32',
+ },
+ 'ascxalan/pod.asc' => {
+ 'version' => 2,
+ 'cmpext' => '.xalan.htm.win32',
+ 'modperl' => 1,
+ 'aliasdir' => 1,
+ 'msg' => ' xalan',
+ 'condition' => '$XALANPATH && $EPWIN32',
},
'incxmlLibXSLT.htm' => {
'version' => 2,
@@ -2332,7 +2352,7 @@
if ($EPWIN32)
{
my $exitcode = 0 ;
- #Win32::Process::KillProcess($httpdpid, $exitcode)
+ Win32::Process::KillProcess($httpdpid, $exitcode)
}
else
{
@@ -2692,7 +2712,7 @@
if ($EPWIN32)
{
- $HttpdObj->Kill(-1) if ($HttpdObj) ;
+ $HttpdObj->Kill(-1) if ($HttpdObj && !$opt_nokill) ;
}
else
{
No revision
No revision
1.1.2.4 +2 -1 embperl/Embperl/Attic/Constant.pm
Index: Constant.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Constant.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Constant.pm 6 Feb 2002 18:22:33 -0000 1.1.2.3
+++ Constant.pm 10 Mar 2002 20:27:19 -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: Constant.pm,v 1.1.2.3 2002/02/06 18:22:33 richter Exp $
+# $Id: Constant.pm,v 1.1.2.4 2002/03/10 20:27:19 richter Exp $
#
###################################################################################
@@ -88,6 +88,7 @@
use constant optKeepSpaces => 0x100000 ;
use constant optOpenLogEarly => 0x200000 ;
use constant optNoUncloseWarn => 0x400000 ;
+use constant optShowBacktrace => 0x8000000 ;
use constant ok => 0 ;
No revision
No revision
1.1.2.16 +10 -13 embperl/Embperl/Syntax/Attic/SSI.pm
Index: SSI.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/SSI.pm,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- SSI.pm 5 Feb 2002 09:04:05 -0000 1.1.2.15
+++ SSI.pm 10 Mar 2002 20:27:19 -0000 1.1.2.16
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: SSI.pm,v 1.1.2.15 2002/02/05 09:04:05 richter Exp $
+# $Id: SSI.pm,v 1.1.2.16 2002/03/10 20:27:19 richter Exp $
#
###################################################################################
@@ -28,7 +28,7 @@
} ;
use strict ;
-use vars qw{@ISA $apreq $epreq} ;
+use vars qw{@ISA} ;
@ISA = qw(Embperl::Syntax::HTML) ;
@@ -178,15 +178,12 @@
sub InitSSI
{
- $epreq = shift ;
- $apreq = shift ;
-
my $fn ;
$ENV{DATE_GMT} = gmtime ;
$ENV{DATE_LOCAL} = localtime ;
- $ENV{DOCUMENT_NAME} = basename ($fn = $epreq -> component -> sourcefile) ;
- $ENV{DOCUMENT_URI} = $apreq?$apreq -> uri:'' ;
+ $ENV{DOCUMENT_NAME} = basename ($fn = $Embperl::req -> component -> sourcefile)
;
+ $ENV{DOCUMENT_URI} = $Embperl::req -> apache_req?$Embperl::req -> apache_req
-> uri:'' ;
$ENV{LAST_MODIFIED} = format_time('', (stat ($fn))[9]) ;
}
@@ -220,7 +217,7 @@
my ($fn, $virt) = @_;
my $req;
- if (!defined ($apreq))
+ if (!defined ($Embperl::req -> apache_req))
{
if ($fn)
{
@@ -239,7 +236,7 @@
#die "Cannot use 'virtual' without mod_perl" if ($virt) ;
- if ($filename =~ /^\//) {
+ if ($filename && ($filename =~ /^\//)) {
$filename = $ENV{DOCUMENT_ROOT} . $filename;
}
return $filename;
@@ -247,12 +244,12 @@
if ($fn)
{
- my $req = $apreq -> lookup_file (InterpretVars ($fn)) ;
+ my $req = $Embperl::req -> apache_req -> lookup_file (InterpretVars ($fn)) ;
return $req -> filename ;
}
if ($virt)
{
- my $req = $apreq -> lookup_uri (InterpretVars ($virt)) ;
+ my $req = $Embperl::req -> apache_req -> lookup_uri (InterpretVars ($virt))
;
return $req -> filename ;
}
else
@@ -355,7 +352,7 @@
$filename = $fn;
}
elsif ($virt) {
- if ($filename =~ /^\//) {
+ if ($filename && ($filename =~ /^\//)) {
$filename = $ENV{DOCUMENT_ROOT} . "/$filename";
}
}
@@ -388,7 +385,7 @@
die "Cannot use 'cgi' without mod_perl" ;
}
- my $r = $apreq ;
+ my $r = $Embperl::req -> apache_req ;
my $filename = $r->filename;
die ("httpd: exec used but not allowed in $filename") if ($r->allow_options &
&OPT_INCNOEXEC) ;
No revision
No revision
1.1.2.1 +11 -0 embperl/test/cmp/Attic/includeerrbt.htm
No revision
No revision
1.24.4.53 +12 -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.52
retrieving revision 1.24.4.53
diff -u -r1.24.4.52 -r1.24.4.53
--- httpd.conf.src 5 Mar 2002 08:07:23 -0000 1.24.4.52
+++ httpd.conf.src 10 Mar 2002 20:27:19 -0000 1.24.4.53
@@ -50,7 +50,19 @@
PerlRequire \"$EPPATH/test/conf/$EPSTARTUP\"
#PerlModule causes some warning with Perl 5.005_03
#PerlModule Embperl
+
+EOD
+
+if (!$EPWIN32)
+ {
+ print OFH <<EOD ;
+
AddModule embperl.c
+
+EOD
+ }
+
+print OFH <<EOD ;
Embperl_UseEnv off
No revision
No revision
1.1.2.1 +21 -0 embperl/test/html/Attic/includeerrbt.htm
No revision
No revision
1.1.2.1.6.6 +11 -11 embperl/test/html/registry/Execute.htm
Index: Execute.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/Execute.htm,v
retrieving revision 1.1.2.1.6.5
retrieving revision 1.1.2.1.6.6
diff -u -r1.1.2.1.6.5 -r1.1.2.1.6.6
--- Execute.htm 6 Feb 2002 09:21:08 -0000 1.1.2.1.6.5
+++ Execute.htm 10 Mar 2002 20:27:19 -0000 1.1.2.1.6.6
@@ -34,14 +34,14 @@
req_rec => $r}) ;
-print "<H1> 2.) Include from memory with some Embperl code</H1>\n" ;
+print "\n<H1> 2.) Include from memory with some Embperl code</H1>\n" ;
Embperl::Execute ({input => \'[- @ar = (a1, b2, c3)
-]<table><tr><td>[+$ar[$col]+]</td> </tr> </table> </P>',
mtime => 1,
inputfile => 'table',
req_rec => $r}) ;
-print "<H1> 3.) Include from memory with passing of variables</H1>\n" ;
+print "\n<H1> 3.) Include from memory with passing of variables</H1>\n" ;
$MyPackage::Interface::Var = 'Some Var' ;
@@ -52,7 +52,7 @@
'package' => 'MyPackage::Interface',
req_rec => $r}) ;
-print "<H1> 4.) Change the variable, but not the code</H1>\n" ;
+print "\n<H1> 4.) Change the variable, but not the code</H1>\n" ;
$MyPackage::Interface::Var = 'Do it again' ;
@@ -67,7 +67,7 @@
req_rec => $r}) ;
-print "<H1> 5.) Use \@param to pass parameters</H1>\n" ;
+print "\n<H1> 5.) Use \@param to pass parameters</H1>\n" ;
Embperl::Execute ({input => \'<P>Use @param to transfer some data ([+
"@param" +]) !</P>',
@@ -78,12 +78,12 @@
) ;
-print "<H1> 6.) Use \@param to pass parameters and return it</H1>\n" ;
+print "\n<H1> 6.) Use \@param to pass parameters and return it</H1>\n" ;
my @p = ('vara', 'varb') ;
-print "<H3> \$p[0] is $p[0] and \$p[1] is $p[1]<H3>" ;
+print "\n<H3> \$p[0] is $p[0] and \$p[1] is $p[1]<H3>" ;
Embperl::Execute ({input => \'<P>Got data in @param ([+ "@param" +])
!</P>[- $param[0] = "newA" ; $param[1] = "newB" ; -]<P>Change data in @param to ([+
"@param" +]) !</P>',
inputfile => 'Param & Return',
@@ -91,7 +91,7 @@
param => \@p }
) ;
-print "<H3> \$p[0] is now $p[0] and \$p[1] is now $p[1]<H3>" ;
+print "\n<H3> \$p[0] is now $p[0] and \$p[1] is now $p[1]<H3>" ;
print "<H1> 7.) Presetup \%fdat and \@ffld</H1>\n" ;
@@ -108,14 +108,14 @@
) ;
-print "<H1> 8.) Inculde a file</H1>\n" ;
+print "\n<H1> 8.) Inculde a file</H1>\n" ;
Embperl::Execute ({inputfile => '../inc.htm',
req_rec => $r}) ;
-print "<H1> 9.) Inculde a file and return output in a scalar</H1>\n" ;
+print "\n<H1> 9.) Inculde a file and return output in a scalar</H1>\n" ;
my $out ;
@@ -124,9 +124,9 @@
req_rec => $r}) ;
-print "<H3>$out</H3>\n" ;
+print "\n<H3>$out</H3>\n" ;
-print "<H1> 10.) Done :-)</H1>\n" ;
+print "\n<H1> 10.) Done :-)</H1>\n" ;
print "</body></html>\n";
1.2.6.5 +6 -6 embperl/test/html/registry/tied.htm
Index: tied.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/tied.htm,v
retrieving revision 1.2.6.4
retrieving revision 1.2.6.5
diff -u -r1.2.6.4 -r1.2.6.5
--- tied.htm 27 Feb 2002 11:58:26 -0000 1.2.6.4
+++ tied.htm 10 Mar 2002 20:27:19 -0000 1.2.6.5
@@ -44,7 +44,7 @@
input => \$tst1,
mtime => 1}) ;
-print "rc = $rc\n" ;
+print "\nrc = $rc\n" ;
print "<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 2.) Include from memory: numeric</H1>\n" ;
@@ -54,7 +54,7 @@
mtime => 1,
options =>
Embperl::Constant::optReturnError}) ;
-print "rc = $rc\n" ;
+print "\nrc = $rc\n" ;
print "<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 3.) Include from memory: string</H1>\n" ;
@@ -65,7 +65,7 @@
options =>
Embperl::Constant::optReturnError}) ;
-print "rc = $rc\n" ;
+print "\nrc = $rc\n" ;
print "<HTML><TITLE>Test for Embperl::Execute</TITLE><BODY>\n" ;
print "<H1> 4.) Include from memory: array</H1>\n" ;
@@ -75,7 +75,7 @@
mtime => 1}) ;
-print "rc = $rc\n" ;
+print "\nrc = $rc\n" ;
tie $tiedvar1, 'Embperl::Test::Tie', $tst1 ;
@@ -87,7 +87,7 @@
mtime => 1}) ;
-print "rc = $rc\n" ;
+print "\nrc = $rc\n" ;
@@ -100,7 +100,7 @@
options =>
Embperl::Constant::optReturnError}) ;
-print "rc = $rc\n" ;
+print "\nrc = $rc\n" ;
print "<H1> 6.) Done :-)</H1>\n" ;
No revision
No revision
1.1.2.26 +10 -0 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.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- ep_structure.map 5 Mar 2002 12:46:02 -0000 1.1.2.25
+++ ep_structure.map 10 Mar 2002 20:27:19 -0000 1.1.2.26
@@ -1,4 +1,5 @@
MALLOC=svinc:$dest = ($type)SvREFCNT_inc($src)
+ FREE=svinc:SvREFCNT_dec($src)
<tTokenTable>
! pCompilerInfo | compiler_info
@@ -73,6 +74,10 @@
pStateHash | sdat
pAppHash | mdat
bDebug | debug
+ nErrorsCount | errors_count
+ nErrorsLastTime | errors_last_time
+ nErrorsLastSendTime | errors_last_send_time
+
new
! private
</tApp>
@@ -97,6 +102,9 @@
sMailfrom | mailfrom
bMaildebug | maildebug
sMailErrorsTo | mail_errors_to
+ nMailErrorsLimit | mail_errors_limit
+ nMailErrorsResetTime | mail_errors_reset_time
+ nMailErrorsResendTime | mail_errors_resend_time
sObjectBase | object_base
sObjectApp | object_app
pObjectAddpathAV | object_addpath
@@ -168,6 +176,8 @@
bDebug | debug
bOptions | options
nEscMode | escmode
+ nInputEscMode | input_escmode
+ sInputCharset | input_charset
bEP1Compat | ep1compat
sCacheKey | cache_key
bCacheKeyOptions | cache_key_options
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
