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 2001/11/02 11:03:50 UTC
cvs commit: embperl/test/html/EmbperlObject eposubsub.htm
richter 01/11/02 02:03:50
Modified: . Changes.pod Embperl.pm Embperl.pod EmbperlD.pod
embperl.h ep.h epapinit.c epdat.h epeval.c epmain.c
test/cmp discard.htm epobase.htm errdoc2.htm error.htm
errpage.htm includeerr1.htm includeerr2.htm
opmasktrap.htm opmasktrap.htm.561 taint.htm
unclosed.htm varerr.htm varerr.htm56
test/html/EmbperlObject eposubsub.htm
Log:
Better error reporting
Revision Changes Path
1.185 +14 -1 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- Changes.pod 2001/09/08 13:23:21 1.184
+++ Changes.pod 2001/11/02 10:03:48 1.185
@@ -13,7 +13,8 @@
with POSTed data reported by Lukas Zapletal.
- Display correct Apache module name in Makefile.PL when
requesting path for Apache module. Patch from James Lee.
- - New session handling using Apache::SessionX
+ - New session handling using Apache::SessionX. (This also
+ fixes problem with MD5 and Perl 5.6.1)
- Fixed a bug that cause file-uploads to fail for the first
request to a file when running under EmbperlObject. Reported
by Thoren Johne.
@@ -26,6 +27,8 @@
- If Perl's STDOUT and/or STDIN are tied to any package, Embperl now
calls the Perl methods PRINT and READ for doing I/O. This currently
only works, when not running under mod_perl.
+ - Embperl can now run under FastCGI. Use embpfastcgi.pl instead of
+ embpcgi.pl.
- Delete unnecessary PerlFixupHandler from httpd.conf.src for make test.
Reported by David Merberg.
- Add undef to %idat for select tag with nothing selected if
@@ -34,6 +37,16 @@
Problem reported by Kee Hinckley.
- Embperl can now use encrypted sourcefiles. See crypto/README for
details.
+ - Embperl can now be installed as Apache and non Apache version on the
+ same system. This is neccessary to work on Windows in- and outside of
+ Apache.
+ - Fixed a linkage problem with symbol embperl_module, first reported
+ by GustavKristoffer Ek.
+ - error message now always contain a filename.
+ - Added optShowBacktrace to enable backtrace of filename in error messages
+ - Removed obsolete debug flags dbgDisableCache, dbgWatchScalar,
+ dbgEarlyHttpHeader
+
=head1 1.3.3 (RELEASE) 6. Juni 2001
1.173 +4 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- Embperl.pm 2001/09/13 07:28:47 1.172
+++ Embperl.pm 2001/11/02 10:03:48 1.173
@@ -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.172 2001/09/13 07:28:47 richter Exp $
+# $Id: Embperl.pm,v 1.173 2001/11/02 10:03:48 richter Exp $
#
###################################################################################
@@ -374,7 +374,7 @@
create_unknown => 1,
) ;
my $session_handler = $ENV{EMBPERL_SESSION_HANDLER_CLASS} || 'Apache::SessionX' ;
-my $ver ;
+my $ver = '' ;
if (defined ($ENV{EMBPERL_SESSION_ARGS}))
{
@@ -620,6 +620,8 @@
shift @path while ($skip--) ;
my $fn = '' ;
print LOG "[$$]Embperl path search Path: " . join (';',@path) . " Filename: $filename\n" if ($debug);
+ print LOG "[$$]Embperl path search pathskip = $pathskip pathndx = $pathndx\n" if ($debug);
+
#$$pathref = join (';', @path) ;
foreach (@path)
1.76 +6 -0 embperl/Embperl.pod
Index: Embperl.pod
===================================================================
RCS file: /home/cvs/embperl/Embperl.pod,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Embperl.pod 2001/11/02 04:23:36 1.75
+++ Embperl.pod 2001/11/02 10:03:48 1.76
@@ -606,6 +606,12 @@
where C<$errors> is a array reference. (1.3b5+)
+=item optShowBacktrace = 0x8000000
+
+When set every error message not only show the sourcefiles, but all files
+from which this file was called by Execute.
+
+
=item optSafeNamespace = 4
Tells Embperl to execute the embedded code in a safe namespace so the
1.48 +4 -0 embperl/EmbperlD.pod
Index: EmbperlD.pod
===================================================================
RCS file: /home/cvs/embperl/EmbperlD.pod,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- EmbperlD.pod 2001/11/02 04:23:36 1.47
+++ EmbperlD.pod 2001/11/02 10:03:48 1.48
@@ -553,6 +553,10 @@
zu ermitteln, wobei C<$errors> eine Arrayreferenz ist. (1.3b5+)
+=item optShowBacktrace = 0x8000000
+
+Wenn gesetzt wird bei der Ausgabe von Fehlermeldungen zus�tzlich eine Liste
+aller Dateien ausgegeben diese die aktulle Sourcedatei aufgerufen haben.
=item optSafeNamespace = 4
1.29 +10 -5 embperl/embperl.h
Index: embperl.h
===================================================================
RCS file: /home/cvs/embperl/embperl.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- embperl.h 2001/09/08 13:23:21 1.28
+++ embperl.h 2001/11/02 10:03:48 1.29
@@ -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.28 2001/09/08 13:23:21 richter Exp $
+# $Id: embperl.h,v 1.29 2001/11/02 10:03:48 richter Exp $
#
###################################################################################*/
@@ -102,9 +102,9 @@
dbgFunc = 4096,
dbgLogLink = 8192,
dbgDefEval = 16384,
- dbgCacheDisable = 0x08000,
- dbgEarlyHttpHeader = 0x10000,
- dbgWatchScalar = 0x20000,
+ dbgOutput = 0x08000,
+ dbgDOM = 0x10000,
+ dbgRun = 0x20000,
dbgHeadersIn = 0x40000,
dbgShowCleanup = 0x80000,
dbgProfile = 0x100000,
@@ -114,6 +114,10 @@
dbgParse = 0x1000000,
dbgObjectSearch = 0x2000000,
dbgCache = 0x4000000,
+ dbgCompile = 0x8000000,
+ dbgXML = 0x10000000,
+ dbgXSLT = 0x20000000,
+ dbgCheckpoint = 0x40000000,
dbgAll = -1
} ;
@@ -150,7 +154,8 @@
optDisableSelectScan = 0x800000,
optAddUserSessionToLinks = 0x1000000,
optAddStateSessionToLinks = 0x2000000,
- optNoSessionCookies = 0x4000000
+ optNoSessionCookies = 0x4000000,
+ optShowBacktrace = 0x8000000
} ;
/*
1.40 +1 -1 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ep.h 2001/09/01 21:31:10 1.39
+++ ep.h 2001/11/02 10:03:48 1.40
@@ -144,7 +144,7 @@
#endif
-module MODULE_VAR_EXPORT embperl_module;
+void embperl_ApacheAddModule () ;
#endif
1.3 +27 -19 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epapinit.c 2001/04/27 06:37:57 1.2
+++ epapinit.c 2001/11/02 10:03:48 1.3
@@ -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.2 2001/04/27 06:37:57 richter Exp $
+# $Id: epapinit.c,v 1.3 2001/11/02 10:03:48 richter Exp $
#
###################################################################################*/
@@ -19,33 +19,19 @@
#ifdef APACHE
-static void embperl_ApacheInitCleanup (void * p)
-
- {
- /* make sure embperl module is removed before mod_perl */
- ap_remove_module (&embperl_module) ;
- }
-
-static void embperl_ApacheInit (server_rec *s, pool *p)
+static void embperl_ApacheInit (server_rec *s, pool *p) ;
+static void embperl_ApacheInitCleanup (void * p) ;
- {
- pool * subpool = ap_make_sub_pool(p);
- ap_register_cleanup(subpool, NULL, embperl_ApacheInitCleanup, embperl_ApacheInitCleanup);
- ap_add_version_component ("Embperl/"VERSION) ;
- }
-
-
-
-
static const command_rec embperl_cmds[] =
{
{NULL}
};
-module MODULE_VAR_EXPORT embperl_module = {
+/* static module MODULE_VAR_EXPORT embperl_module = { */
+static module embperl_module = {
STANDARD_MODULE_STUFF,
embperl_ApacheInit, /* initializer */
NULL, /* dir config creater */
@@ -67,5 +53,27 @@
NULL /* post read-request */
};
+
+void embperl_ApacheAddModule ()
+
+ {
+ ap_add_module (&embperl_module) ;
+ }
+
+static void embperl_ApacheInit (server_rec *s, pool *p)
+
+ {
+ pool * subpool = ap_make_sub_pool(p);
+
+ ap_register_cleanup(subpool, NULL, embperl_ApacheInitCleanup, embperl_ApacheInitCleanup);
+ ap_add_version_component ("Embperl/"VERSION) ;
+ }
+
+static void embperl_ApacheInitCleanup (void * p)
+
+ {
+ /* make sure embperl module is removed before mod_perl */
+ ap_remove_module (&embperl_module) ;
+ }
#endif
1.37 +10 -5 embperl/epdat.h
Index: epdat.h
===================================================================
RCS file: /home/cvs/embperl/epdat.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- epdat.h 2001/09/13 07:28:47 1.36
+++ epdat.h 2001/11/02 10:03:48 1.37
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdat.h,v 1.36 2001/09/13 07:28:47 richter Exp $
+# $Id: epdat.h,v 1.37 2001/11/02 10:03:48 richter Exp $
#
###################################################################################*/
@@ -29,7 +29,7 @@
ckoptPathInfo = 2, /* include the PathInfo into CacheKey */
ckoptQueryInfo = 4, /* include the QueryInfo into CacheKey */
ckoptDontCachePost = 8, /* don't cache POST requests */
- ckoptDefault = 15, /* default is all options set */
+ ckoptDefault = 15 /* default is all options set */
} tCacheOptions ;
@@ -108,9 +108,9 @@
const char * sEndText ; /* string which ends the block */
const char * sNodeName; /* name of the node to create */
int nNodeName ; /* index in string table of node name */
- enum tNodeType nNodeType ; /* type of the node that should be created */
- enum tNodeType nCDataType ;/* type for sub nodes that contains text */
- enum tNodeType nForceType ;/* force this type for sub nodes */
+ tNodeType nNodeType ; /* type of the node that should be created */
+ tNodeType nCDataType ;/* type for sub nodes that contains text */
+ tNodeType nForceType ;/* force this type for sub nodes */
int bUnescape ; /* translate input? */
int bAddFlags ; /* add flags to node */
int bRemoveSpaces ; /* 1 remove spaces before tag, 2 remove after */
@@ -132,6 +132,7 @@
struct tToken * pTokens ; /* table with all tokens */
int numTokens ; /* number of tokens in above table */
int bLSearch ; /* when set perform a linear, instead of a binary search */
+ int nDefNodeType ; /* either ntypCDATA or ntypText */
struct tToken * pContainsToken ;/* pointer to the token that has a pContains defined (could be only one per table) */
} ;
@@ -155,6 +156,7 @@
typedef struct tConf
{
+ HV * pReqParameter ; /* parameters passed to this request */
int bDebug ; /* Debugging options */
int bOptions ; /* Options */
char * sPackage ; /* Packagename */
@@ -177,6 +179,7 @@
tCacheOptions bCacheKeyOptions ;
double nExpiresIn ; /* Data expiers at */
CV * pExpiresCV ; /* sub that is called to determinate expiration */
+ char * sRecipe ; /* name of recipe used to process the current file */
#endif
char * sPath ; /* file search path */
char * sReqFilename ; /* filename of original request */
@@ -415,6 +418,8 @@
tNode xDocument ; /* Document node */
tNode xCurrNode ; /* node that was last executed */
+ tRepeatLevel nCurrRepeatLevel ; /* repeat level for node that was last executed */
+ tIndex nCurrCheckpoint ; /* next checkpoint that should be passed if execution order is unchanged (i.e. no loop/if) */
tIndex xCurrDomTree ; /* DomTree we are currently working on */
tIndex xSourceDomTree ;/* DomTree which contains the source */
#endif
1.30 +1 -4 embperl/epeval.c
Index: epeval.c
===================================================================
RCS file: /home/cvs/embperl/epeval.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- epeval.c 2001/05/29 06:28:10 1.29
+++ epeval.c 2001/11/02 10:03:48 1.30
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epeval.c,v 1.29 2001/05/29 06:28:10 richter Exp $
+# $Id: epeval.c,v 1.30 2001/11/02 10:03:48 richter Exp $
#
###################################################################################*/
@@ -539,9 +539,6 @@
return rcEvalErr ;
}
-
- if (r -> bDebug & dbgWatchScalar)
- Watch (r) ;
return ok ;
1.115 +195 -83 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- epmain.c 2001/09/08 13:23:21 1.114
+++ epmain.c 2001/11/02 10:03:48 1.115
@@ -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.114 2001/09/08 13:23:21 richter Exp $
+# $Id: epmain.c,v 1.115 2001/11/02 10:03:48 richter Exp $
#
###################################################################################*/
@@ -75,7 +75,9 @@
const char * msg ;
char * sText ;
SV * pSV ;
+ SV * pSVLine = NULL ;
SV ** ppSV ;
+ STRLEN l ;
int n ;
@@ -91,68 +93,107 @@
switch (rc)
{
- case ok: msg ="[%d]ERR: %d: Line %d: ok%s%s" ; break ;
- case rcStackOverflow: msg ="[%d]ERR: %d: Line %d: Stack Overflow%s%s" ; break ;
- case rcArgStackOverflow: msg ="[%d]ERR: %d: Line %d: Argumnet Stack Overflow (%s)%s" ; break ;
- case rcStackUnderflow: msg ="[%d]ERR: %d: Line %d: Stack Underflow%s%s" ; break ;
- case rcEndifWithoutIf: msg ="[%d]ERR: %d: Line %d: endif without if%s%s" ; break ;
- case rcElseWithoutIf: msg ="[%d]ERR: %d: Line %d: else without if%s%s" ; break ;
- case rcEndwhileWithoutWhile: msg ="[%d]ERR: %d: Line %d: endwhile without while%s%s" ; break ;
- case rcEndtableWithoutTable: msg ="[%d]ERR: %d: Line %d: blockend <%s> does not match blockstart <%s>" ; break ;
- case rcTablerowOutsideOfTable: msg ="[%d]ERR: %d: Line %d: <tr> outside of table%s%s" ; break ;
- case rcCmdNotFound: msg ="[%d]ERR: %d: Line %d: Unknown Command %s%s" ; break ;
- case rcOutOfMemory: msg ="[%d]ERR: %d: Line %d: Out of memory%s%s" ; break ;
- case rcPerlVarError: msg ="[%d]ERR: %d: Line %d: Perl variable error %s%s" ; break ;
- case rcHashError: msg ="[%d]ERR: %d: Line %d: Perl hash error, %%%s does not exist%s" ; break ;
- case rcArrayError: msg ="[%d]ERR: %d: Line %d: Perl array error , @%s does not exist%s" ; break ;
- case rcFileOpenErr: msg ="[%d]ERR: %d: Line %d: File %s open error: %s" ; break ;
- case rcLogFileOpenErr: msg ="[%d]ERR: %d: Line %d: Logfile %s open error: %s" ; break ;
- case rcMissingRight: msg ="[%d]ERR: %d: Line %d: Missing right %s%s" ; break ;
- case rcNoRetFifo: msg ="[%d]ERR: %d: Line %d: No Return Fifo%s%s" ; break ;
- case rcMagicError: msg ="[%d]ERR: %d: Line %d: Perl Magic Error%s%s" ; break ;
- case rcWriteErr: msg ="[%d]ERR: %d: Line %d: File write Error%s%s" ; break ;
- case rcUnknownNameSpace: msg ="[%d]ERR: %d: Line %d: Namespace %s unknown%s" ; break ;
- case rcInputNotSupported: msg ="[%d]ERR: %d: Line %d: Input not supported in mod_perl mode%s%s" ; break ;
- case rcCannotUsedRecursive: msg ="[%d]ERR: %d: Line %d: Cannot be called recursivly in mod_perl mode%s%s" ; break ;
- case rcEndtableWithoutTablerow: msg ="[%d]ERR: %d: Line %d: </tr> without <tr>%s%s" ; break ;
- case rcEndtextareaWithoutTextarea: msg ="[%d]ERR: %d: Line %d: </textarea> without <textarea>%s%s" ; break ;
- case rcEvalErr: msg ="[%d]ERR: %d: Line %d: Error in Perl code: %s%s" ; break ;
- case rcNotCompiledForModPerl: msg ="[%d]ERR: %d: Line %d: Embperl is not compiled for mod_perl. Rerun Makefile.PL and give the correct Apache source tree location %s%s" ; break ;
- case rcExecCGIMissing: msg ="[%d]ERR: %d: Line %d: Forbidden %s: Options ExecCGI not set in your Apache configs%s" ; break ;
- case rcIsDir: msg ="[%d]ERR: %d: Line %d: Forbidden %s is a directory%s" ; break ;
- case rcXNotSet: msg ="[%d]ERR: %d: Line %d: Forbidden %s X Bit not set%s" ; break ;
- case rcNotFound: msg ="[%d]ERR: %d: Line %d: Not found %s%s" ; break ;
- case rcUnknownVarType: msg ="[%d]ERR: %d: Line %d: Type for Variable %s is unknown %s" ; break ;
- case rcPerlWarn: msg ="[%d]ERR: %d: Line %d: Warning in Perl code: %s%s" ; break ;
- case rcVirtLogNotSet: msg ="[%d]ERR: %d: Line %d: EMBPERL_VIRTLOG must be set, when dbgLogLink is set %s%s" ; break ;
- case rcMissingInput: msg ="[%d]ERR: %d: Line %d: Sourcedata missing %s%s" ; break ;
- case rcUntilWithoutDo: msg ="[%d]ERR: %d: Line %d: until without do%s%s" ; break ;
- case rcEndforeachWithoutForeach:msg ="[%d]ERR: %d: Line %d: endforeach without foreach%s%s" ; break ;
- case rcMissingArgs: msg ="[%d]ERR: %d: Line %d: Too few arguments%s%s" ; break ;
- case rcNotAnArray: msg ="[%d]ERR: %d: Line %d: Second Argument must be array/list%s%s" ; break ;
- case rcCallInputFuncFailed: msg ="[%d]ERR: %d: Line %d: Call to Input Function failed: %s%s" ; break ;
- case rcCallOutputFuncFailed: msg ="[%d]ERR: %d: Line %d: Call to Output Function failed: %s%s" ; break ;
- case rcSubNotFound: msg ="[%d]ERR: %d: Line %d: Call to unknown Embperl macro %s%s" ; break ;
- case rcImportStashErr: msg ="[%d]ERR: %d: Line %d: Package %s for import unknown%s" ; break ;
- case rcCGIError: msg ="[%d]ERR: %d: Line %d: Setup of CGI.pm failed: %s%s" ; break ;
- case rcUnclosedHtml: msg ="[%d]ERR: %d: Line %d: Unclosed HTML tag <%s> at end of file %s" ; break ;
- case rcUnclosedCmd: msg ="[%d]ERR: %d: Line %d: Unclosed command [$ %s $] at end of file %s" ; break ;
- case rcNotAllowed: msg ="[%d]ERR: %d: Line %d: Forbidden %s: Does not match EMBPERL_ALLOW %s" ; break ;
- case rcNotHashRef: msg ="[%d]ERR: %d: Line %d: %s need hashref in %s" ; break ;
- case rcTagMismatch: msg ="[%d]ERR: %d: Line %d: Endtag '%s' doesn't match starttag '%s'" ; break ;
- case rcCleanupErr: msg ="[%d]ERR: %d: Line %d: Error in cleanup %s%s" ; break ;
- case rcCryptoWrongHeader: msg ="[%d]ERR: %d: Line %d: Decrypt-error: Not encrypted (%s)%s" ; break ;
- case rcCryptoWrongSyntax: msg ="[%d]ERR: %d: Line %d: Decrypt-error: Wrong syntax (%s)%s" ; break ;
- case rcCryptoNotSupported: msg ="[%d]ERR: %d: Line %d: Decrypt-error: Not supported (%s)%s" ; break ;
- case rcCryptoBufferOverflow: msg ="[%d]ERR: %d: Line %d: Decrypt-error: Buffer overflow (%s)%s" ; break ;
- case rcCryptoErr: msg ="[%d]ERR: %d: Line %d: Decrypt-error: OpenSSL error (%s)%s" ; break ;
+ case ok: msg ="[%d]ERR: %d: %s ok%s%s" ; break ;
+ case rcStackOverflow: msg ="[%d]ERR: %d: %s Stack Overflow%s%s" ; break ;
+ case rcArgStackOverflow: msg ="[%d]ERR: %d: %s Argumnet Stack Overflow (%s)%s" ; break ;
+ case rcStackUnderflow: msg ="[%d]ERR: %d: %s Stack Underflow%s%s" ; break ;
+ case rcEndifWithoutIf: msg ="[%d]ERR: %d: %s endif without if%s%s" ; break ;
+ case rcElseWithoutIf: msg ="[%d]ERR: %d: %s else without if%s%s" ; break ;
+ case rcEndwhileWithoutWhile: msg ="[%d]ERR: %d: %s endwhile without while%s%s" ; break ;
+ case rcEndtableWithoutTable: msg ="[%d]ERR: %d: %s blockend <%s> does not match blockstart <%s>" ; break ;
+ case rcTablerowOutsideOfTable: msg ="[%d]ERR: %d: %s <tr> outside of table%s%s" ; break ;
+ case rcCmdNotFound: msg ="[%d]ERR: %d: %s Unknown Command %s%s" ; break ;
+ case rcOutOfMemory: msg ="[%d]ERR: %d: %s Out of memory%s%s" ; break ;
+ case rcPerlVarError: msg ="[%d]ERR: %d: %s Perl variable error %s%s" ; break ;
+ case rcHashError: msg ="[%d]ERR: %d: %s Perl hash error, %%%s does not exist%s" ; break ;
+ case rcArrayError: msg ="[%d]ERR: %d: %s Perl array error , @%s does not exist%s" ; break ;
+ case rcFileOpenErr: msg ="[%d]ERR: %d: %s File %s open error: %s" ; break ;
+ case rcLogFileOpenErr: msg ="[%d]ERR: %d: %s Logfile %s open error: %s" ; break ;
+ case rcMissingRight: msg ="[%d]ERR: %d: %s Missing right %s%s" ; break ;
+ case rcNoRetFifo: msg ="[%d]ERR: %d: %s No Return Fifo%s%s" ; break ;
+ case rcMagicError: msg ="[%d]ERR: %d: %s Perl Magic Error%s%s" ; break ;
+ case rcWriteErr: msg ="[%d]ERR: %d: %s File write Error%s%s" ; break ;
+ case rcUnknownNameSpace: msg ="[%d]ERR: %d: %s Namespace %s unknown%s" ; break ;
+ case rcInputNotSupported: msg ="[%d]ERR: %d: %s Input not supported in mod_perl mode%s%s" ; break ;
+ case rcCannotUsedRecursive: msg ="[%d]ERR: %d: %s Cannot be called recursivly in mod_perl mode%s%s" ; break ;
+ case rcEndtableWithoutTablerow: msg ="[%d]ERR: %d: %s </tr> without <tr>%s%s" ; break ;
+ case rcEndtextareaWithoutTextarea: msg ="[%d]ERR: %d: %s </textarea> without <textarea>%s%s" ; break ;
+ case rcEvalErr: msg ="[%d]ERR: %d: %s Error in Perl code: %s%s" ; break ;
+ case rcNotCompiledForModPerl: msg ="[%d]ERR: %d: %s Embperl is not compiled for mod_perl. Rerun Makefile.PL and give the correct Apache source tree location %s%s" ; break ;
+ case rcExecCGIMissing: msg ="[%d]ERR: %d: %s Forbidden %s: Options ExecCGI not set in your Apache configs%s" ; break ;
+ case rcIsDir: msg ="[%d]ERR: %d: %s Forbidden %s is a directory%s" ; break ;
+ case rcXNotSet: msg ="[%d]ERR: %d: %s Forbidden %s X Bit not set%s" ; break ;
+ case rcNotFound: msg ="[%d]ERR: %d: %s Not found %s%s" ; break ;
+ case rcUnknownVarType: msg ="[%d]ERR: %d: %s Type for Variable %s is unknown %s" ; break ;
+ case rcPerlWarn: msg ="[%d]ERR: %d: %s Warning in Perl code: %s%s" ; break ;
+ case rcVirtLogNotSet: msg ="[%d]ERR: %d: %s EMBPERL_VIRTLOG must be set, when dbgLogLink is set %s%s" ; break ;
+ case rcMissingInput: msg ="[%d]ERR: %d: %s Sourcedata missing %s%s" ; break ;
+ case rcUntilWithoutDo: msg ="[%d]ERR: %d: %s until without do%s%s" ; break ;
+ case rcEndforeachWithoutForeach:msg ="[%d]ERR: %d: %s endforeach without foreach%s%s" ; break ;
+ case rcMissingArgs: msg ="[%d]ERR: %d: %s Too few arguments%s%s" ; break ;
+ case rcNotAnArray: msg ="[%d]ERR: %d: %s Second Argument must be array/list%s%s" ; break ;
+ case rcCallInputFuncFailed: msg ="[%d]ERR: %d: %s Call to Input Function failed: %s%s" ; break ;
+ case rcCallOutputFuncFailed: msg ="[%d]ERR: %d: %s Call to Output Function failed: %s%s" ; break ;
+ case rcSubNotFound: msg ="[%d]ERR: %d: %s Call to unknown Embperl macro %s%s" ; break ;
+ case rcImportStashErr: msg ="[%d]ERR: %d: %s Package %s for import unknown%s" ; break ;
+ case rcCGIError: msg ="[%d]ERR: %d: %s Setup of CGI.pm failed: %s%s" ; break ;
+ case rcUnclosedHtml: msg ="[%d]ERR: %d: %s Unclosed HTML tag <%s> at end of file %s" ; break ;
+ case rcUnclosedCmd: msg ="[%d]ERR: %d: %s Unclosed command [$ %s $] at end of file %s" ; break ;
+ case rcNotAllowed: msg ="[%d]ERR: %d: %s Forbidden %s: Does not match EMBPERL_ALLOW %s" ; break ;
+ case rcNotHashRef: msg ="[%d]ERR: %d: %s %s need hashref in %s" ; break ;
+ case rcTagMismatch: msg ="[%d]ERR: %d: %s Endtag '%s' doesn't match starttag '%s'" ; break ;
+ case rcCleanupErr: msg ="[%d]ERR: %d: %s Error in cleanup %s%s" ; break ;
+ case rcCryptoWrongHeader: msg ="[%d]ERR: %d: %s Decrypt-error: Not encrypted (%s)%s" ; break ;
+ case rcCryptoWrongSyntax: msg ="[%d]ERR: %d: %s Decrypt-error: Wrong syntax (%s)%s" ; break ;
+ case rcCryptoNotSupported: msg ="[%d]ERR: %d: %s Decrypt-error: Not supported (%s)%s" ; break ;
+ case rcCryptoBufferOverflow: msg ="[%d]ERR: %d: %s Decrypt-error: Buffer overflow (%s)%s" ; break ;
+ case rcCryptoErr: msg ="[%d]ERR: %d: %s Decrypt-error: OpenSSL error (%s)%s" ; break ;
- default: msg ="[%d]ERR: %d: Line %d: Error %s%s" ; break ;
+ default: msg ="[%d]ERR: %d: %s Error %s%s" ; break ;
}
- pSV = newSVpvf (msg, r -> nPid , rc, r -> Buf.nSourceline, r -> errdat1, r -> errdat2) ;
+ if ((rc != rcPerlWarn && rc != rcEvalErr) || r -> errdat1[0] == '\0')
+ {
+ char * p = NULL ;
+ char buf[20] = "" ;
+ if (!r -> Buf.pFile || !r -> Buf.pFile -> sSourcefile)
+ p = "" ;
+ if (!p)
+ p = strrchr (r -> Buf.pFile -> sSourcefile, '/') ;
+ if (p)
+ p++ ;
+ else
+ {
+ p = strrchr (r -> Buf.pFile -> sSourcefile, '\\') ;
+ if (!p)
+ p = r -> Buf.pFile -> sSourcefile ;
+ else
+ p++ ;
+ }
+ if (r -> Buf.nSourceline)
+ sprintf (buf, "(%d)", r -> Buf.nSourceline) ;
+ pSVLine = newSVpvf ("%s%s:", p, buf) ;
+ }
+
+
+
+ pSV = newSVpvf (msg, r -> nPid , rc, pSVLine?SvPV(pSVLine, l):"", r -> errdat1, r -> errdat2) ;
+
+ if (r -> bOptions & optShowBacktrace)
+ {
+ req * l = r ;
+ while (l)
+ {
+ sv_catpvf(pSV, "\n %s", (!r -> Buf.pFile || !r -> Buf.pFile -> sSourcefile)?"<no filename available>":r -> Buf.pFile -> sSourcefile) ;
+ l = r -> pLastReq ;
+ }
+ }
+
+
+ if (pSVLine)
+ SvREFCNT_dec(pSVLine) ;
- sText = SvPV (pSV, na) ;
+ sText = SvPV (pSV, l) ;
lprintf (r, "%s\n", sText) ;
@@ -382,7 +423,6 @@
OPTMG (dbgFunc , pCurrReq -> bDebug)
OPTMG (dbgLogLink , pCurrReq -> bDebug)
OPTMG (dbgDefEval , pCurrReq -> bDebug)
-OPTMG (dbgWatchScalar , pCurrReq -> bDebug)
OPTMG (dbgHeadersIn , pCurrReq -> bDebug)
OPTMG (dbgShowCleanup , pCurrReq -> bDebug)
OPTMG (dbgProfile , pCurrReq -> bDebug)
@@ -1393,7 +1433,7 @@
r -> pApacheReq = NULL ;
if (_nIOType == epIOMod_Perl)
{
- ap_add_module (&embperl_module) ;
+ embperl_ApacheAddModule () ;
}
#endif
r -> bReqRunning = 0 ;
@@ -1623,7 +1663,6 @@
ADDOPTMG (dbgFunc )
ADDOPTMG (dbgLogLink )
ADDOPTMG (dbgDefEval )
- ADDOPTMG (dbgWatchScalar )
ADDOPTMG (dbgHeadersIn )
ADDOPTMG (dbgShowCleanup )
ADDOPTMG (dbgProfile )
@@ -1756,9 +1795,10 @@
pConf -> pCloseBracket = "*]" ;
pConf -> sPath = sstrdup (GetHashValueStr (pReqInfo, "path", pCurrReq -> pConf?pCurrReq -> pConf -> sPath:NULL)) ; /* file search path */
pConf -> sReqFilename = sstrdup (GetHashValueStr (pReqInfo, "reqfilename", pCurrReq -> pConf?pCurrReq -> pConf -> sReqFilename:NULL)) ; /* filename of original request */
+ pConf -> pReqParameter = pReqInfo ;
-
#ifdef EP2
+ pConf -> sRecipe = sstrdup (GetHashValueStr (pReqInfo, "recipe", "Embperl")) ; /* Recipe name */
pConf -> bEP1Compat = GetHashValueInt (pReqInfo, "ep1compat", pCurrReq -> pConf?pCurrReq -> pConf -> bEP1Compat:pCurrReq -> bEP1Compat) ; /* EP1Compat */
pConf -> sCacheKey = sstrdup (GetHashValueStr (pReqInfo, "cache_key", pCurrReq -> pConf?pCurrReq -> pConf -> sCacheKey:NULL)) ; ;
@@ -2440,12 +2480,6 @@
r -> numCacheHits = 0 ;
}
- /* for backwards compability */
- if (r -> bDebug & dbgEarlyHttpHeader)
- r -> bOptions |= optEarlyHttpHeader ;
-
-
-
if (r -> bDebug)
{
switch (r -> nIOType)
@@ -2459,7 +2493,7 @@
lprintf (r, "[%d]REQ: %s %s ", r -> nPid, (r -> bOptions & optSafeNamespace)?"SafeNamespace":"No Safe Eval", (r -> bOptions & optOpcodeMask)?"OpcodeMask":"All Opcode allowed") ;
#ifdef EP2
- lprintf (r, " mode = %s (%d) %s\n", sMode, r -> nIOType, r -> bEP1Compat?"EP 1.x":"EP 2.x") ;
+ lprintf (r, " mode = %s (%d) %s recipe = %s\n", sMode, r -> nIOType, r -> bEP1Compat?"EP 1.x":"EP 2.x", r -> pConf -> sRecipe) ;
#else
lprintf (r, " mode = %s (%d)\n", sMode, r -> nIOType) ;
#endif
@@ -2734,6 +2768,16 @@
SV * pCookie2 = NULL ;
int bError = 0 ;
STRLEN ldummy ;
+
+#ifdef EP2
+ /* ### tmp ### */
+ int bXSLT = 0 ;
+
+ if (strcmp (r -> pConf -> sRecipe + strlen (r -> pConf -> sRecipe) - 4 , "XSLT") == 0)
+ {
+ bXSLT = 1 ;
+ }
+#endif
r -> bEscModeSet = 0 ;
@@ -3000,6 +3044,7 @@
if (bOutToMem)
pOut = SvRV (pOutData) ;
+
#ifdef APACHE
if ((r -> pApacheReq == NULL || !r -> pApacheReq -> header_only) &&
(!(r -> bOptions & optEarlyHttpHeader) || r -> bAppendToMainReq))
@@ -3013,7 +3058,59 @@
if (r -> pCurrEscape)
#endif
oputs (r, "\r\n") ;
+#ifdef EP2
+ if (bXSLT && !bError && !r -> bEP1Compat)
+ {
+ char * pData ;
+ int l ;
+
+ tDomTree * pDomTree = DomTree_self (r -> xCurrDomTree) ;
+ Node_toString (r, pDomTree, pDomTree -> xDocument, 0) ;
+
+ pOut = newSVpv ("", 0) ;
+ oputs (r, "\r\n") ;
+ l = GetContentLength (r) + 1 ;
+
+ SvGROW (pOut, l) ;
+ pData = SvPVX (pOut) ;
+ oCommitToMem (r, NULL, pData) ;
+ oRollbackOutput (r, NULL) ;
+ SvCUR_set (pOut, l - 1) ;
+
+ if (r -> bAppendToMainReq)
+ oBegin (r) ;
+
+
+ if (strstr (r -> pConf -> sRecipe, "LibXSLT"))
+ {
+#ifdef LIBXSLT
+ if (r -> bDebug & dbgXSLT)
+ lprintf (r, "[%d]XSLT: call libxslt\n", r -> nPid) ;
+
+ if ((rc = embperl_LibXSLT_Text2Text (r, r -> pConf -> pReqParameter, pOut)) != ok)
+ return rc ;
+#else
+ strcpy (r -> errdat1, "libxslt not supported") ;
+ return 9999 ;
+#endif
+ }
+ else if (strstr (r -> pConf -> sRecipe, "Xalan"))
+ {
+#ifdef XALAN
+ if (r -> bDebug & dbgXSLT)
+ lprintf (r, "[%d]XSLT: call xalan\n", r -> nPid) ;
+
+ if ((rc = embperl_Xalan_Text2Text (r, r -> pConf -> pReqParameter, pOut)) != ok)
+ return rc ;
+#else
+ strcpy (r -> errdat1, "xalan not supported") ;
+ return 9999 ;
+#endif
+ }
+ }
+#endif
+
if (bOutToMem)
{
char * pData ;
@@ -3023,7 +3120,7 @@
if (!bError && !r -> bEP1Compat)
{
tDomTree * pDomTree = DomTree_self (r -> xCurrDomTree) ;
- Node_toString (pDomTree, r, pDomTree -> xDocument) ;
+ Node_toString (r, pDomTree, pDomTree -> xDocument, 0) ;
}
if (!r -> bEP1Compat)
@@ -3060,7 +3157,21 @@
if (!bError && !r -> pImportStash)
{
tDomTree * pDomTree = DomTree_self (r -> xCurrDomTree) ;
- l -> xCurrNode = Node_insertAfter (pDomTree, pDomTree -> xDocument, DomTree_self (l -> xCurrDomTree), l -> xCurrNode) ;
+ if (bXSLT)
+ {
+ int len = GetContentLength (r) + 1 ;
+ char * pData = _malloc (r, len) ;
+ oCommitToMem (r, NULL, pData) ;
+ oRollbackOutput (r, NULL) ;
+ l -> xCurrNode = Node_appendChild (DomTree_self (l -> xCurrDomTree),
+ l -> xCurrNode,
+ l -> nCurrRepeatLevel,
+ ntypCDATA,
+ 0,
+ pData, len - 1, 0, 0, "XSLT Result") ;
+ }
+ else
+ l -> xCurrNode = Node_insertAfter (pDomTree, pDomTree -> xDocument, 0, DomTree_self (l -> xCurrDomTree), l -> xCurrNode, l -> nCurrRepeatLevel) ;
}
}
#endif
@@ -3069,10 +3180,10 @@
{
oCommit (r, NULL) ;
#ifdef EP2
- if (!bError && !r -> bEP1Compat && !r -> pImportStash)
+ if (!bError && !r -> bEP1Compat && !r -> pImportStash && !bXSLT)
{
tDomTree * pDomTree = DomTree_self (r -> xCurrDomTree) ;
- Node_toString (pDomTree, r, pDomTree -> xDocument) ;
+ Node_toString (r, pDomTree, pDomTree -> xDocument, 0) ;
oputs (r, "\r\n") ;
}
#endif
@@ -3088,7 +3199,7 @@
else if (!r -> bEP1Compat)
{
tDomTree * pDomTree = DomTree_self (r -> xCurrDomTree) ;
- Node_toString (pDomTree, r, pDomTree -> xDocument) ;
+ Node_toString (r, pDomTree, pDomTree -> xDocument, 0) ;
}
#endif
}
@@ -3624,14 +3735,6 @@
else
LogError (r, rc) ;
- /* --- restore working directory --- */
- if ((r -> bOptions & optDisableChdir) == 0)
- {
-#ifdef WIN32
- _chdrive (olddrive) ;
-#endif
- chdir (olddir) ;
- }
/* --- Restore Operatormask and Package, destroy temp perl sv's --- */
FREETMPS ;
@@ -3641,6 +3744,15 @@
/* --- send http header and data to the browser if not already done --- */
if ((rc = EndOutput (r, rc, r -> pOutData)) != ok)
LogError (r, rc) ;
+
+ /* --- restore working directory --- */
+ if ((r -> bOptions & optDisableChdir) == 0)
+ {
+#ifdef WIN32
+ _chdrive (olddrive) ;
+#endif
+ chdir (olddir) ;
+ }
/* --- reset variables and log end of request --- */
if ((rc = ResetRequest (r, sInputfile)) != ok)
1.4 +11 -11 embperl/test/cmp/discard.htm
Index: discard.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/discard.htm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- discard.htm 1999/10/05 06:02:04 1.3
+++ discard.htm 2001/11/02 10:03:49 1.4
@@ -2,17 +2,17 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error\.<P><P>
-^-\[.*?\]ERR\: \d+\: Line 60\: Warning in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
-^\[.*?\]ERR\: \d+\: Line 60\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
-^-\[.*?\]ERR\: \d+\: Line 68\: Warning in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
-^\[.*?\]ERR\: \d+\: Line 68\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
-^\[.*?\]ERR\: \d+\: Line 68\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
-^\[.*?\]ERR\: \d+\: Line 68\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
-^\[.*?\]ERR\: \d+\: Line 68\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
-^-\[.*?\]ERR\: \d+\: Line 72\: Warning in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
-^\[.*?\]ERR\: \d+\: Line 72\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
-^-\[.*?\]ERR\: \d+\: Line 78\: Warning in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
-^\[.*?\]ERR\: \d+\: Line 78\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^-\[.*?\]ERR\: \d+\: Warning in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^\[.*?\]ERR\: \d+\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^-\[.*?\]ERR\: \d+\: Warning in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^\[.*?\]ERR\: \d+\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^\[.*?\]ERR\: \d+\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^\[.*?\]ERR\: \d+\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^\[.*?\]ERR\: \d+\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^-\[.*?\]ERR\: \d+\: Warning in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^\[.*?\]ERR\: \d+\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^-\[.*?\]ERR\: \d+\: Warning in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
+^\[.*?\]ERR\: \d+\: Error in Perl code\: \(in cleanup\) Can't find string terminator '"' anywhere before EOF at
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.3 +3 -3 embperl/test/cmp/epobase.htm
Index: epobase.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/epobase.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epobase.htm 2001/05/02 05:30:16 1.2
+++ epobase.htm 2001/11/02 10:03:49 1.3
@@ -2,8 +2,8 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error
-^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 30\: Line \d+\: Not found <no filename><p>
-^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 30\: epobase.htm\(6\): Not found <no filename><p>
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.6 +13 -20 embperl/test/cmp/errdoc2.htm
Index: errdoc2.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/errdoc2.htm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- errdoc2.htm 2000/10/17 08:23:07 1.5
+++ errdoc2.htm 2001/11/02 10:03:49 1.6
@@ -15,31 +15,24 @@
^There are 1(0|2|3|5) errormessages:
<table border=1>
-^ <tr><td>\[\d+\]ERR: 32: Line 13: Warning in Perl code: Use of uninitialized value
+^ <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Use of uninitialized value
-^ <tr><td>\[\d+\]ERR: 32: Line 14: Warning in Perl code: Use of uninitialized value
+^ <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Use of uninitialized value
-^ <tr><td>\[\d+\]ERR: 32: Line 15: Warning in Perl code: Use of uninitialized value
+^ <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Use of uninitialized value
-^ <tr><td>\[\d+\]ERR: 32: Line 16: Warning in Perl code: Use of uninitialized value
+^ <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Use of uninitialized value
-^ <tr><td>\[\d+\]ERR: 32: Line 17: Warning in Perl code: Use of uninitialized value
+^ <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Use of uninitialized value
-^- <tr><td>\[\d+\]ERR: 32: Line 21: Warning in Perl code: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word at
-^-
-^ <tr><td>\[\d+\]ERR: 24: Line 21: Error in Perl code: syntax error at
-
-^ <tr><td>\[\d+\]ERR: 24: Line 32: Error in Perl code: syntax error at
-
-^ <tr><td>\[\d+\]ERR: 24: Line 32: Error in Perl code: Can't call method "qq2" without a package or object reference at
-
-^ <tr><td>\[\d+\]ERR: 32: Line 32: Warning in Perl code: Use of uninitialized value
-
-^- <tr><td>\[\d+\]ERR: 32: Line 46: Warning in Perl code: Bareword found where operator expected at
-^-
-^- <tr><td>\[\d+\]ERR: 32: Line 46: Warning in Perl code: \(Missing operator before is\?\)</td></tr>
-^-
-^ <tr><td>\[\d+\]ERR: 24: Line 46: Error in Perl code: syntax error at
+^- <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word at
+^ <tr><td>\[\d+\]ERR: 24: Error in Perl code: syntax error at
+^ <tr><td>\[\d+\]ERR: 24: Error in Perl code: syntax error at
+^ <tr><td>\[\d+\]ERR: 24: Error in Perl code: Can't call method "qq2" without a package or object reference at
+^ <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Use of uninitialized value
+^- <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Bareword found where operator expected at
+^- <tr><td>\[\d+\]ERR: 32: Warning in Perl code: \(Missing operator before is\?\)</td></tr>
+^ <tr><td>\[\d+\]ERR: 24: Error in Perl code: syntax error at
^Missing right.*?bracket at
^syntax error at
</table>
1.6 +15 -15 embperl/test/cmp/error.htm
Index: error.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/error.htm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- error.htm 2000/03/28 19:14:11 1.5
+++ error.htm 2001/11/02 10:03:49 1.6
@@ -2,23 +2,23 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error
-^\[.*?\]ERR\: 32\: Line 13\: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 14\: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 15\: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 16\: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 17\: Warning in Perl code\: Use of uninitialized value
-^^\[.*?\]ERR\: 32\: Line 21\: Warning in Perl code\: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word at .*? line \d*\.
-^\[.*?\]ERR\: 24\: Line 21\: Error in Perl code\: syntax error at .*? line \d*\, at EOF
-^\[.*?\]ERR\: 24\: Line 32\: Error in Perl code\: syntax error at .*? line \d*\, at EOF
-^\[.*?\]ERR\: 24\: Line 32\: Error in Perl code\: Can.*?
-^\[.*?\]ERR\: 32\: Line 32\: Warning in Perl code\: Use of uninitialized value
-^^\[.*?\]ERR\: 32\: Line 46\: Warning in Perl code\: Bareword found where operator expected at .*?
-^^\[.*?\]ERR\: 32\: Line 46\: Warning in Perl code\: \(Missing operator before is\?\)
-^\[.*?\]ERR\: 24\: Line 46\: Error in Perl code\: syntax error at .*? line \d*\, near \"\;\$error is here \"\;
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^^\[.*?\]ERR\: 32\: Warning in Perl code\: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word at .*? line \d*\.
+^\[.*?\]ERR\: 24\: Error in Perl code\: syntax error at .*? line \d*\, at EOF
+^\[.*?\]ERR\: 24\: Error in Perl code\: syntax error at .*? line \d*\, at EOF
+^\[.*?\]ERR\: 24\: Error in Perl code\: Can.*?
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^^\[.*?\]ERR\: 32\: Warning in Perl code\: Bareword found where operator expected at .*?
+^^\[.*?\]ERR\: 32\: Warning in Perl code\: \(Missing operator before is\?\)
+^\[.*?\]ERR\: 24\: Error in Perl code\: syntax error at .*? line \d*\, near \"\;\$error is here \"\;
^<br> Missing right .*?bracket at .*? line \d*\, at end of line
^<br> syntax error at .*? line \d*\, at EOF
-^\[.*?\]ERR\: 20\: Line 58\: \<\;\/tr\>\; without \<\;tr\>\;
-^\[.*?\]ERR\: 45\: Line 58\: Unclosed HTML tag <table> at end of file
+^\[.*?\]ERR\: 20\: error.htm\(58\)\: \<\;\/tr\>\; without \<\;tr\>\;
+^\[.*?\]ERR\: 45\: error.htm\(58\)\: Unclosed HTML tag <table> at end of file
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.8 +15 -15 embperl/test/cmp/errpage.htm
Index: errpage.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/errpage.htm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- errpage.htm 2000/03/28 19:14:11 1.7
+++ errpage.htm 2001/11/02 10:03:49 1.8
@@ -4,23 +4,23 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error\.
-^\[.*?\]ERR\: 32\: Line 13\: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 14\: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 15\: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 16\: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 17\: Warning in Perl code\: Use of uninitialized value
-^^\[.*?\]ERR\: 32\: Line 21\: Warning in Perl code\: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word at .*? line \d*\.
-^\[.*?\]ERR\: 24\: Line 21\: Error in Perl code\: syntax error at .*? line \d*\, at EOF
-^\[.*?\]ERR\: 24\: Line 32\: Error in Perl code\: syntax error at .*? line \d*\, at EOF
-^\[.*?\]ERR\: 24\: Line 32\: Error in Perl code\: Can.*?
-^\[.*?\]ERR\: 32\: Line 32\: Warning in Perl code\: Use of uninitialized value
-^^\[.*?\]ERR\: 32\: Line 46\: Warning in Perl code\: Bareword found where operator expected at .*?
-^^\[.*?\]ERR\: 32\: Line 46\: Warning in Perl code\: \(Missing operator before is\?\)
-^\[.*?\]ERR\: 24\: Line 46\: Error in Perl code\: syntax error at .*? line \d*\, near \"\;\$error is here \"\;
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^^\[.*?\]ERR\: 32\: Warning in Perl code\: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word at .*? line \d*\.
+^\[.*?\]ERR\: 24\: Error in Perl code\: syntax error at .*? line \d*\, at EOF
+^\[.*?\]ERR\: 24\: Error in Perl code\: syntax error at .*? line \d*\, at EOF
+^\[.*?\]ERR\: 24\: Error in Perl code\: Can.*?
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^^\[.*?\]ERR\: 32\: Warning in Perl code\: Bareword found where operator expected at .*?
+^^\[.*?\]ERR\: 32\: Warning in Perl code\: \(Missing operator before is\?\)
+^\[.*?\]ERR\: 24\: Error in Perl code\: syntax error at .*? line \d*\, near \"\;\$error is here \"\;
^<br> Missing right.*?bracket
^<br> syntax error at .*? line \d*\, at EOF
-^\[.*?\]ERR\: 20\: Line 58\: \<\;\/tr\>\; without \<\;tr\>\;
-^\[.*?\]ERR\: 45\: Line 58\: Unclosed HTML tag <table> at end of file
+^\[.*?\]ERR\: 20\: error.htm\(58\)\: \<\;\/tr\>\; without \<\;tr\>\;
+^\[.*?\]ERR\: 45\: error.htm\(58\)\: Unclosed HTML tag <table> at end of file
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.6 +1 -1 embperl/test/cmp/includeerr1.htm
Index: includeerr1.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/includeerr1.htm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- includeerr1.htm 2001/04/27 07:40:28 1.5
+++ includeerr1.htm 2001/11/02 10:03:49 1.6
@@ -2,7 +2,7 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error
-^\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method "is" via package "here"
+^\[.*?\]ERR\: 24\: Error in Perl code: Can't locate object method "is" via package "here"
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.8 +10 -10 embperl/test/cmp/includeerr2.htm
Index: includeerr2.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/includeerr2.htm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- includeerr2.htm 2001/09/13 07:28:48 1.7
+++ includeerr2.htm 2001/11/02 10:03:49 1.8
@@ -2,16 +2,16 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error
-^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method "is" via package "here"
-^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^-\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method "is" via package "here"
-^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^-\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method "is" via package "here"
-^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 32\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 32\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 32\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 32\: Warning in Perl code: Use of uninitialized value
+^\[.*?\]ERR\: 24\: Error in Perl code: Can't locate object method "is" via package "here"
+^-\[.*?\]ERR\: 32\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 24\: Error in Perl code: Can't locate object method "is" via package "here"
+^-\[.*?\]ERR\: 32\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 24\: Error in Perl code: Can't locate object method "is" via package "here"
+^-\[.*?\]ERR\: 32\: Warning in Perl code: Use of uninitialized value
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.5 +4 -4 embperl/test/cmp/opmasktrap.htm
Index: opmasktrap.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/opmasktrap.htm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opmasktrap.htm 2000/03/28 19:14:11 1.4
+++ opmasktrap.htm 2001/11/02 10:03:49 1.5
@@ -2,10 +2,10 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error\.
-^\[.*?\]ERR\: 32\: Line 204: Warning in Perl code\: Use of uninitialized value
-^-\[.*?\]ERR\: 32\: Line 211: Warning in Perl code
-^\[.*?]ERR\: 24\: Line 211: Error in Perl code\:
-^\[.*?\]ERR\: 24\: Line 215: Error in Perl code\: syntax error at .*? line \d*\, near \"\;package main\"\;
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^-\[.*?\]ERR\: 32\: Warning in Perl code
+^\[.*?]ERR\: 24\: Error in Perl code\:
+^\[.*?\]ERR\: 24\: Error in Perl code\: syntax error at .*? line \d*\, near \"\;package main\"\;
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.2 +3 -3 embperl/test/cmp/opmasktrap.htm.561
Index: opmasktrap.htm.561
===================================================================
RCS file: /home/cvs/embperl/test/cmp/opmasktrap.htm.561,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opmasktrap.htm.561 2001/04/27 07:42:28 1.1
+++ opmasktrap.htm.561 2001/11/02 10:03:49 1.2
@@ -2,9 +2,9 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error\.
-^\[.*?\]ERR\: 32\: Line 204: Warning in Perl code\: Use of uninitialized value
-^-\[.*?\]ERR\: 32\: Line 211: Warning in Perl code
-^\[.*?\]ERR\: 24\: Line \d+: Error in Perl code\: \(in cleanup\) iteration finalizer trapped by operation mask
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^-\[.*?\]ERR\: 32\: Warning in Perl code
+^\[.*?\]ERR\: 24\: Error in Perl code\: \(in cleanup\) iteration finalizer trapped by operation mask
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.4 +2 -2 embperl/test/cmp/taint.htm
Index: taint.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/taint.htm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- taint.htm 2000/10/17 07:02:10 1.3
+++ taint.htm 2001/11/02 10:03:49 1.4
@@ -2,8 +2,8 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error\.
-^\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code\: Insecure \$ENV\{PATH\} while running with \-T switch
-^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 24\: Error in Perl code\: Insecure \$ENV\{PATH\} while running with \-T switch
+^-\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
^ HTML::Embperl .*?<P>
</BODY></HTML>
1.3 +1 -1 embperl/test/cmp/unclosed.htm
Index: unclosed.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/unclosed.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unclosed.htm 1999/10/05 06:02:21 1.2
+++ unclosed.htm 2001/11/02 10:03:49 1.3
@@ -2,6 +2,6 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error
-^\[.*?\]ERR\: 46\: Line 12\: Unclosed command \[\$ if \$\] at end of file
+^\[.*?\]ERR\: 46\: unclosed.htm\(12\): Unclosed command \[\$ if \$\] at end of file
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.6 +5 -5 embperl/test/cmp/varerr.htm
Index: varerr.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/varerr.htm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- varerr.htm 2000/03/28 19:46:07 1.5
+++ varerr.htm 2001/11/02 10:03:49 1.6
@@ -2,11 +2,11 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error\.
-^\[.*?\]ERR\: 32\: Line 16: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 17: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 18: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: (32\: Line 19: Warning|24\: Line 19: Error) in Perl code\: Global symbol \"\;\$?d\"\; requires explicit package name at.*?
-^\[.*?\]ERR\: (32\: Line 20: Warning|24\: Line 20: Error) in Perl code\: Global symbol \"\;\$?e\"\; requires explicit package name at.*?
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: (32\: Warning|24\: Error) in Perl code\: Global symbol \"\;\$?d\"\; requires explicit package name at.*?
+^\[.*?\]ERR\: (32\: Warning|24\: Error) in Perl code\: Global symbol \"\;\$?e\"\; requires explicit package name at.*?
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.2 +9 -9 embperl/test/cmp/varerr.htm56
Index: varerr.htm56
===================================================================
RCS file: /home/cvs/embperl/test/cmp/varerr.htm56,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- varerr.htm56 2000/03/29 07:39:12 1.1
+++ varerr.htm56 2001/11/02 10:03:49 1.2
@@ -2,16 +2,16 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error occurred\, and anything you might have done that may have caused the error\.
-^\[.*?\]ERR\: 32\: Line 16: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 17: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line 18: Warning in Perl code\: Use of uninitialized value
-^\[.*?\]ERR\: (32\: Line 19: Warning|24\: Line 19: Error) in Perl code\: Global symbol \"\;\$?d\"\; requires explicit package name at.*?
-^\[.*?\]ERR\: (32\: Line 20: Warning|24\: Line 20: Error) in Perl code\: Global symbol \"\;\$?e\"\; requires explicit package name at.*?
-^\[.*?]ERR\: 24\: Line 42: Error in Perl code: Global symbol \"\;\$e\"\; requires explicit package name at
-^\[.*?]ERR\: 24\: Line 43: Error in Perl code: Global symbol \"\;\$d\"\; requires explicit package name at
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: (32\: Warning|24\: Error) in Perl code\: Global symbol \"\;\$?d\"\; requires explicit package name at.*?
+^\[.*?\]ERR\: (32\: Warning|24\: Error) in Perl code\: Global symbol \"\;\$?e\"\; requires explicit package name at.*?
+^\[.*?]ERR\: 24\: Error in Perl code: Global symbol \"\;\$e\"\; requires explicit package name at
+^\[.*?]ERR\: 24\: Error in Perl code: Global symbol \"\;\$d\"\; requires explicit package name at
^<br> Global symbol "\$e" requires explicit package name at
-^\[.*?]ERR\: 24\: Line 50: Error in Perl code: Global symbol \"\;\$d\"\; requires explicit package name at
-^\[.*?]ERR\: 24\: Line 51: Error in Perl code: Global symbol \"\;\$e\"\; requires explicit package name at
+^\[.*?]ERR\: 24\: Error in Perl code: Global symbol \"\;\$d\"\; requires explicit package name at
+^\[.*?]ERR\: 24\: Error in Perl code: Global symbol \"\;\$e\"\; requires explicit package name at
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.3 +4 -2 embperl/test/html/EmbperlObject/eposubsub.htm
Index: eposubsub.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/EmbperlObject/eposubsub.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eposubsub.htm 2000/10/17 07:25:21 1.2
+++ eposubsub.htm 2001/11/02 10:03:50 1.3
@@ -1,3 +1,5 @@
+[$if 0 > 1 $]
+xxxxxxxx
+[$else$]
eposubsub in base dir
-
-
+[$endif$]
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org