richter 02/02/28 21:38:53
Modified: . Tag: Embperl2c embperl.h epinit.c epmain.c test.pl
Embperl Tag: Embperl2c Run.pm
Embperl/Syntax Tag: Embperl2c POD.pm
test/html/pod Tag: Embperl2c pod.asc
Log:
session handling & pod
Revision Changes Path
No revision
No revision
1.19.4.22 +2 -32 embperl/embperl.h
Index: embperl.h
===================================================================
RCS file: /home/cvs/embperl/embperl.h,v
retrieving revision 1.19.4.21
retrieving revision 1.19.4.22
diff -u -r1.19.4.21 -r1.19.4.22
--- embperl.h 27 Feb 2002 08:19:41 -0000 1.19.4.21
+++ embperl.h 1 Mar 2002 05:38:51 -0000 1.19.4.22
@@ -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.21 2002/02/27 08:19:41 richter Exp $
+# $Id: embperl.h,v 1.19.4.22 2002/03/01 05:38:51 richter Exp $
#
###################################################################################*/
@@ -88,6 +88,7 @@
rcChdirError,
rcUnknownSyntax,
rcCannotCheckUri,
+ rcSetupSessionErr,
rcForbidden = 401,
rcNotFound = 404,
rcDecline = -1
@@ -168,35 +169,6 @@
optShowBacktrace = 0x8000000
} ;
-/*
- I/O modes
-*/
-
-enum epIO
- {
- epIOCGI = 1,
- epIOProcess = 2,
- epIOMod_Perl = 3,
- epIOPerl = 4
- } ;
-
-/*
- Table modes
-*/
-
-#define epTabRow 0x0f /* Row Mask */
-#define epTabRowDef 0x01 /* Last row where last defined expression */
-#define epTabRowUndef 0x02 /* Last row where first undefined expression */
-#define epTabRowMax 0x03 /* maxrow determinates number of rows */
-
-#define epTabCol 0xf0 /* Column Mask */
-#define epTabColDef 0x10 /* Last column where last defined expression */
-#define epTabColUndef 0x20 /* Last column where first undefined expression */
-#define epTabColMax 0x30 /* maxcol determinates number of columns */
-
-
-
-
/*
Escape modes
@@ -221,9 +193,7 @@
smodeUDatParam = 2,
smodeUDatUrl = 4,
- smodeSDatCookie = 0x10,
smodeSDatParam = 0x20,
- smodeSDatUrl = 0x40,
} ;
#define smodeStd smodeUDatCookie
1.1.2.33 +19 -4 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -r1.1.2.32 -r1.1.2.33
--- epinit.c 27 Feb 2002 11:58:23 -0000 1.1.2.32
+++ epinit.c 1 Mar 2002 05:38:51 -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: epinit.c,v 1.1.2.32 2002/02/27 11:58:23 richter Exp $
+# $Id: epinit.c,v 1.1.2.33 2002/03/01 05:38:51 richter Exp $
#
###################################################################################*/
@@ -258,7 +258,9 @@
if (SvTRUE (ERRSV))
{
STRLEN l ;
- LogErrorParam (a, rcEvalErr, SvPV (ERRSV, l), NULL) ;
+ if (strcmp (sPackage, "Apache::SessionX") != 0 ||
+ GetHashValueStr (aTHX_ a -> pThread -> pEnvHash, "GATEWAY_INTERFACE",
NULL))
+ LogErrorParam (a, rcSetupSessionErr, SvPV (ERRSV, l), NULL) ;
sv_setpv(ERRSV,"");
return rcEvalErr ;
}
@@ -272,7 +274,7 @@
if (SvTRUE (ERRSV))
{
STRLEN l ;
- LogErrorParam (a, rcEvalErr, SvPV (ERRSV, l), NULL) ;
+ LogErrorParam (a, rcSetupSessionErr, SvPV (ERRSV, l), NULL) ;
sv_setpv(ERRSV,"");
return rcEvalErr ;
}
@@ -282,7 +284,7 @@
PUTBACK;
if (n == 0 || !SvROK(pTie))
{
- LogErrorParam (a, rcNotHashRef, "Session handling", sPackage) ;
+ LogErrorParam (a, rcSetupSessionErr, "TIEHASH didn't returns a hashref",
sPackage) ;
return rcNotHashRef ;
}
hv_magic(pHash, (GV *)pTie, 'P') ;
@@ -333,6 +335,10 @@
HV * pArgs3 ;
dSP ;
+
+ if (strcmp (pCfg -> sSessionHandlerClass, "no") == 0)
+ return ok ;
+
if (!pArgs)
pCfg -> pSessionArgs = pArgs = newHV() ;
@@ -485,6 +491,15 @@
pApp -> pThread = pThread ;
+ if (pPerlParam && SvROK(pPerlParam))
+ {
+ SV * pHV = SvRV(pPerlParam) ;
+ Embperl__App__Config_new_init(aTHX_ &pApp -> Config, pHV, 0) ;
+ }
+
+ tainted = 0 ;
+
+
if (pApp -> Config.sLog && pApp -> Config.sLog[0])
{
if ((rc = OpenLog (pApp)) != ok)
1.75.4.105 +3 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.104
retrieving revision 1.75.4.105
diff -u -r1.75.4.104 -r1.75.4.105
--- epmain.c 27 Feb 2002 11:58:24 -0000 1.75.4.104
+++ epmain.c 1 Mar 2002 05:38:51 -0000 1.75.4.105
@@ -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.104 2002/02/27 11:58:24 richter Exp $
+# $Id: epmain.c,v 1.75.4.105 2002/03/01 05:38:51 richter Exp $
#
###################################################################################*/
@@ -189,7 +189,8 @@
case rcForbidden: msg ="[%d]ERR: %d: %s Access Forbidden for
'%s'" ; break ;
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 ;
+
default: msg ="[%d]ERR: %d: %s Error (no description)
%s %s" ; break ;
}
1.70.4.118 +3 -2 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.117
retrieving revision 1.70.4.118
diff -u -r1.70.4.117 -r1.70.4.118
--- test.pl 27 Feb 2002 11:58:24 -0000 1.70.4.117
+++ test.pl 1 Mar 2002 05:38:52 -0000 1.70.4.118
@@ -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.117 2002/02/27 11:58:24 richter Exp $
+# $Id: test.pl,v 1.70.4.118 2002/03/01 05:38:52 richter Exp $
#
###################################################################################
@@ -958,6 +958,7 @@
$ENV{EMBPERL_LOG} = $logfile ;
$ENV{EMBPERL_DEBUG} = $defaultdebug ;
$ENV{DMALLOC_OPTIONS} = "log=$tmppath/dmalloc.log,debug=0x3f03" ;
+ $ENV{EMBPERL_SESSION_HANDLER_CLASS} = "no" ;
unlink ($logfile) ;
}
@@ -1775,7 +1776,7 @@
foreach (keys %ENV)
{
- delete $ENV{$_} if ((/^EMBPERL_/) && $_ ne 'EMBPERL_LOG' && $_ ne
'EMBPERL_DEBUG') ;
+ delete $ENV{$_} if ((/^EMBPERL_/) && $_ ne 'EMBPERL_LOG' && $_ ne
'EMBPERL_DEBUG' && $_ ne 'EMBPERL_SESSION_HANDLER_CLASS') ;
}
delete $ENV{PATH_TRANSLATED} ;
No revision
No revision
1.1.2.5 +1 -2 embperl/Embperl/Attic/Run.pm
Index: Run.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Run.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Run.pm 16 Feb 2002 23:31:34 -0000 1.1.2.4
+++ Run.pm 1 Mar 2002 05:38:52 -0000 1.1.2.5
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Run.pm,v 1.1.2.4 2002/02/16 23:31:34 richter Exp $
+# $Id: Run.pm,v 1.1.2.5 2002/03/01 05:38:52 richter Exp $
#
###################################################################################
@@ -54,7 +54,6 @@
$param{'param'} = $_[1] if (defined ($_[1])) ;
-
$rc = Embperl::Execute (\%param) ;
return $rc ;
No revision
No revision
1.1.2.11 +9 -3 embperl/Embperl/Syntax/Attic/POD.pm
Index: POD.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/POD.pm,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- POD.pm 16 Feb 2002 18:00:48 -0000 1.1.2.10
+++ POD.pm 1 Mar 2002 05:38:52 -0000 1.1.2.11
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: POD.pm,v 1.1.2.10 2002/02/16 18:00:48 richter Exp $
+# $Id: POD.pm,v 1.1.2.11 2002/03/01 05:38:52 richter Exp $
#
###################################################################################
@@ -316,13 +316,19 @@
{
'text' => "\n",
'contains' => "\r\n",
- 'nodetype' => ntypCDATA,
+ 'nodetype' => ntypTag,
+ 'cdatatype' => 0,
+ 'removespaces' => 0,
+ 'nodename' => "!:\n",
},
'skip2' =>
{
'text' => "\r",
'contains' => "\r\n",
- 'nodetype' => ntypCDATA,
+ 'nodetype' => ntypTag,
+ 'cdatatype' => 0,
+ 'removespaces' => 0,
+ 'nodename' => "!:\n",
},
) ;
No revision
No revision
1.1.2.6 +3 -0 embperl/test/html/pod/Attic/pod.asc
Index: pod.asc
===================================================================
RCS file: /home/cvs/embperl/test/html/pod/Attic/pod.asc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- pod.asc 16 Feb 2002 18:00:48 -0000 1.1.2.5
+++ pod.asc 1 Mar 2002 05:38:53 -0000 1.1.2.6
@@ -12,6 +12,9 @@
some text under HEAD1
+
+
+
more text under HEAD1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
