richter 02/01/19 06:13:42
Modified: . Tag: Embperl2c Embperl.xs epcgiinit.c epcmd2.c
epeval.c epinit.c epio.c epmain.c epmem.c eppriv.h
epprovider.c
Log:
-
Revision Changes Path
No revision
No revision
1.29.4.37 +19 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.36
retrieving revision 1.29.4.37
diff -u -r1.29.4.36 -r1.29.4.37
--- Embperl.xs 19 Jan 2002 13:45:40 -0000 1.29.4.36
+++ Embperl.xs 19 Jan 2002 14:13:41 -0000 1.29.4.37
@@ -14,6 +14,7 @@
#include "ep.h"
#include "xs/ep_xs_typedefs.h"
+#include "xs/ep_xs_sv_convert.h"
MODULE = Embperl PACKAGE = Embperl PREFIX = embperl_
@@ -21,3 +22,21 @@
embperl_Init(pApacheSrvSV, pPerlParam)
SV * pApacheSrvSV
SV * pPerlParam
+
+
+
+MODULE = Embperl::Req PACKAGE = Embperl::Req PREFIX = embperl_
+
+int
+embperl_InitRequest(pApacheReqSV, pPerlParam)
+ SV * pApacheReqSV
+ SV * pPerlParam
+PREINIT:
+ Embperl__Req ppReq;
+PPCODE:
+ RETVAL = embperl_InitRequest(aTHX_ pApacheReqSV, pPerlParam, &ppReq);
+ EXTEND(SP, 2) ;
+ PUSHs(epxs_IV_2obj(RETVAL)) ;
+ PUSHs(epxs_Embperl__Req_2obj(ppReq)) ;
+
+MODULE = Embperl PACKAGE = Embperl PREFIX = embperl_
1.1.2.3 +10 -2 embperl/Attic/epcgiinit.c
Index: epcgiinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcgiinit.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- epcgiinit.c 18 Jan 2002 16:22:36 -0000 1.1.2.2
+++ epcgiinit.c 19 Jan 2002 14:13:41 -0000 1.1.2.3
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcgiinit.c,v 1.1.2.2 2002/01/18 16:22:36 richter Exp $
+# $Id: epcgiinit.c,v 1.1.2.3 2002/01/19 14:13:41 richter Exp $
#
###################################################################################*/
@@ -53,6 +53,9 @@
{
+ #ifdef PERL_IMPLICIT_CONTEXT
+ pTHX = pThread -> pPerlTHX;
+ #endif
return GetHashValueStr (aTHX_ pThread -> pEnvHash, "EMBPERL_APPNAME",
"Embperl") ;
}
@@ -64,6 +67,7 @@
{
+ eptTHX_
tApp * pApp = NULL ;
embperl_DefaultAppConfig (pConfig) ;
@@ -82,6 +86,7 @@
{
tThreadData * pThread = pApp -> pThread ;
+ eptTHX_
embperl_DefaultReqConfig (pConfig) ;
@@ -101,8 +106,9 @@
{
tApp * pApp = pReq -> pApp ;
tThreadData * pThread = pApp -> pThread ;
+ eptTHX_
- embperl_DefaultReqConfig (pConfig) ;
+ embperl_DefaultComponentConfig (pConfig) ;
#define EPCFG_COMPONENT
#include "epcfg.h"
@@ -120,6 +126,8 @@
{
tThreadData * pThread = pApp -> pThread ;
+ eptTHX_
+
pParam -> sFilename = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash,
"PATH_TRANSLATED", "") ;
pParam -> sUnparsedUri = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash,
"REQUEST_URI", "") ;
pParam -> sUri = GetHashValueStrDup (aTHX_ pPool, pThread -> pEnvHash,
"SCRIPT_NAME", "") ;
1.4.2.18 +2 -1 embperl/Attic/epcmd2.c
Index: epcmd2.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcmd2.c,v
retrieving revision 1.4.2.17
retrieving revision 1.4.2.18
diff -u -r1.4.2.17 -r1.4.2.18
--- epcmd2.c 18 Jan 2002 16:22:36 -0000 1.4.2.17
+++ epcmd2.c 19 Jan 2002 14:13:41 -0000 1.4.2.18
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcmd2.c,v 1.4.2.17 2002/01/18 16:22:36 richter Exp $
+# $Id: epcmd2.c,v 1.4.2.18 2002/01/19 14:13:41 richter Exp $
#
###################################################################################*/
@@ -31,6 +31,7 @@
/*in*/ STRLEN nlen)
{
+ epTHX_
STRLEN dlen ;
char * pData ;
char * s ;
1.23.4.16 +7 -9 embperl/epeval.c
Index: epeval.c
===================================================================
RCS file: /home/cvs/embperl/epeval.c,v
retrieving revision 1.23.4.15
retrieving revision 1.23.4.16
diff -u -r1.23.4.15 -r1.23.4.16
--- epeval.c 18 Jan 2002 16:22:36 -0000 1.23.4.15
+++ epeval.c 19 Jan 2002 14:13:41 -0000 1.23.4.16
@@ -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.23.4.15 2002/01/18 16:22:36 richter Exp $
+# $Id: epeval.c,v 1.23.4.16 2002/01/19 14:13:41 richter Exp $
#
###################################################################################*/
@@ -124,15 +124,11 @@
/*in*/ SV ** pArgs,
/*out*/ CV ** pCV)
{
- dSP;
char * s = "Needs CodeRef" ;
#ifdef PERL_IMPLICIT_CONTEXT
- pTHX ;
- if (r)
- aTHX = r -> pPerlTHX ;
- else
- aTHX = PERL_GET_THX ;
+ pTHX = a?a -> pPerlTHX:PERL_GET_THX;
#endif
+ dSP;
EPENTRY (EvalDirect) ;
@@ -577,7 +573,8 @@
return rcEvalErr ;
}
-#ifdef EP2
+#endif
+
/* -------------------------------------------------------------------------------
*
@@ -612,7 +609,6 @@
lprintf (r -> pApp, "[%d]EVAL< %s\n", r -> pThread -> nPid,
sArg?sArg:"<unknown>") ;
tainted = 0 ;
- pCurrReq = r ;
ENTER ;
SAVETMPS ;
@@ -715,6 +711,8 @@
return ok ;
}
+#if 0
+#ifdef EP2
/* -------------------------------------------------------------------------------
*
1.1.2.11 +5 -11 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- epinit.c 19 Jan 2002 13:45:40 -0000 1.1.2.10
+++ epinit.c 19 Jan 2002 14:13:41 -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: epinit.c,v 1.1.2.10 2002/01/19 13:45:40 richter Exp $
+# $Id: epinit.c,v 1.1.2.11 2002/01/19 14:13:41 richter Exp $
#
###################################################################################*/
@@ -457,7 +457,6 @@
int rc ;
tThreadData * pThread ;
tApp * pApp ;
- tAppConfig AppCfg ;
tApacheDirConfig * pApacheCfg = NULL ;
@@ -827,7 +826,7 @@
if (r -> Component.Config.bDebug)
lprintf (r -> pApp, "[%d]Formdata... length = %d\n", r -> pThread ->
nPid, len) ;
- rc = GetFormData (r, p, len) ;
+ rc = embperl_GetFormData (r, p, len) ;
if (len > 0 && f)
{
@@ -865,13 +864,10 @@
{
- int rc ;
tReq * r ;
tThreadData * pThread ;
SV * pReqSV ;
SV * pReqRV ;
- tReqConfig * pReqCfg ;
- tReqParam * pReqParam ;
#ifdef APACHE
request_rec * pApacheReq ;
@@ -939,7 +935,7 @@
r -> nLogFileStartPos = GetLogFilePos (pApp) ;
- HTML__Embperl__Req_new_init (r, pPerlParam) ;
+ Embperl__Req_new_init (r, pPerlParam) ;
hv_clear (pThread -> pHeaderHash) ;
@@ -1076,7 +1072,7 @@
c -> nSourceline = c -> Param.nFirstLine ;
- HTML__Embperl__Component_new_init (c, pPerlParam) ;
+ Embperl__Component_new_init (c, pPerlParam) ;
*ppComponent = c ;
@@ -1187,8 +1183,6 @@
tThreadData * pThread ;
tApp * pApp ;
tReq * r ;
- tAppConfig * pAppCfg ;
- tReqConfig * pReqCfg ;
tApacheDirConfig * pApacheCfg = NULL ;
@@ -1218,7 +1212,7 @@
*ppReq = r ;
- embperl_LogStartRequest (r) ;
+ embperl_LogStartReq (r) ;
return ok ;
}
1.16.4.7 +3 -3 embperl/epio.c
Index: epio.c
===================================================================
RCS file: /home/cvs/embperl/epio.c,v
retrieving revision 1.16.4.6
retrieving revision 1.16.4.7
diff -u -r1.16.4.6 -r1.16.4.7
--- epio.c 17 Jan 2002 23:16:17 -0000 1.16.4.6
+++ epio.c 19 Jan 2002 14:13:41 -0000 1.16.4.7
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epio.c,v 1.16.4.6 2002/01/17 23:16:17 richter Exp $
+# $Id: epio.c,v 1.16.4.7 2002/01/19 14:13:41 richter Exp $
#
###################################################################################*/
@@ -138,7 +138,7 @@
{
oRollbackOutput (r, pBuf) ;
- RollbackError (r) ;
+ /* RollbackError (r) ; */
}
/* ---------------------------------------------------------------------------- */
@@ -190,7 +190,7 @@
}
}
- CommitError (r) ;
+ /* CommitError (r) ; */
}
/* ---------------------------------------------------------------------------- */
1.75.4.83 +3 -1 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.82
retrieving revision 1.75.4.83
diff -u -r1.75.4.82 -r1.75.4.83
--- epmain.c 18 Jan 2002 08:28:12 -0000 1.75.4.82
+++ epmain.c 19 Jan 2002 14:13:41 -0000 1.75.4.83
@@ -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.82 2002/01/18 08:28:12 richter Exp $
+# $Id: epmain.c,v 1.75.4.83 2002/01/19 14:13:41 richter Exp $
#
###################################################################################*/
@@ -1811,6 +1811,7 @@
}
+#if 0
else
{
clock_t cl1 = clock () ;
@@ -1828,6 +1829,7 @@
}
#endif
}
+#endif
return rc ;
}
1.1.2.3 +3 -1 embperl/Attic/epmem.c
Index: epmem.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epmem.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- epmem.c 18 Jan 2002 16:22:36 -0000 1.1.2.2
+++ epmem.c 19 Jan 2002 14:13:41 -0000 1.1.2.3
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmem.c,v 1.1.2.2 2002/01/18 16:22:36 richter Exp $
+# $Id: epmem.c,v 1.1.2.3 2002/01/19 14:13:41 richter Exp $
#
###################################################################################*/
@@ -457,6 +457,8 @@
/* static void run_cleanups(struct cleanup *); */
/* static void free_proc_chain(struct process_chain *); */
+#define run_cleanups(x)
+#define free_proc_chain(x)
struct tMemPool {
union block_hdr *first;
1.1.2.6 +15 -1 embperl/Attic/eppriv.h
Index: eppriv.h
===================================================================
RCS file: /home/cvs/embperl/Attic/eppriv.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- eppriv.h 18 Jan 2002 16:22:36 -0000 1.1.2.5
+++ eppriv.h 19 Jan 2002 14:13:41 -0000 1.1.2.6
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eppriv.h,v 1.1.2.5 2002/01/18 16:22:36 richter Exp $
+# $Id: eppriv.h,v 1.1.2.6 2002/01/19 14:13:41 richter Exp $
#
###################################################################################*/
@@ -20,13 +20,17 @@
#ifdef PERL_IMPLICIT_CONTEXT
#define epTHX pTHX = r -> pPerlTHX
#define epaTHX pTHX = a -> pPerlTHX
+#define eptTHX pTHX = pThread -> pPerlTHX
#define epTHX_ epTHX ;
#define epaTHX_ epaTHX ;
+#define eptTHX_ eptTHX ;
#else
#define epTHX
#define epaTHX
+#define eptTHX
#define epTHX_
#define epaTHX_
+#define eptTHX_
#endif
@@ -197,5 +201,15 @@
/*out*/ tReqParam * pParam) ;
+
+/* --- init --- */
+
+void embperl_DefaultAppConfig (/*in*/ tAppConfig *pCfg) ;
+void embperl_DefaultReqConfig (/*in*/ tReqConfig *pCfg) ;
+void embperl_DefaultComponentConfig (/*in*/ tComponentConfig *pCfg) ;
+
+void Embperl__App_new_init(pApp, pPerlParam) ;
+void Embperl__Req_new_init (r, pPerlParam) ;
+void Embperl__Component_new_init (c, pPerlParam) ;
1.1.2.19 +6 -1 embperl/Attic/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epprovider.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- epprovider.c 18 Jan 2002 16:22:36 -0000 1.1.2.18
+++ epprovider.c 19 Jan 2002 14:13:41 -0000 1.1.2.19
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epprovider.c,v 1.1.2.18 2002/01/18 16:22:36 richter Exp $
+# $Id: epprovider.c,v 1.1.2.19 2002/01/19 14:13:41 richter Exp $
#
###################################################################################*/
@@ -370,6 +370,7 @@
/*in*/ HV * pParam,
/*i/o*/ SV * pKey)
{
+ epTHX_
const char * sFilename = GetHashValueStr (aTHX_ pParam, "filename", "") ;
const char * sDir = "" ;
@@ -508,6 +509,7 @@
{
+ epTHX_
int rc ;
tProviderMem * pNew ;
@@ -572,6 +574,7 @@
/*in*/ HV * pParam,
/*i/o*/ SV * pKey)
{
+ epTHX_
const char * sName = GetHashValueStr (aTHX_ pParam, "name", "") ;
sv_catpvf (pKey, "*memory:%s", sName) ;
@@ -856,6 +859,7 @@
/*in*/ HV * pParam,
/*i/o*/ SV * pKey)
{
+ epTHX_
int rc ;
const char * sSyntax = GetHashValueStr (aTHX_ pParam, "syntax", "") ;
@@ -1071,6 +1075,7 @@
/*in*/ HV * pParam,
/*i/o*/ SV * pKey)
{
+ epTHX_
int rc ;
if ((rc = Cache_AppendKey (r, pParam, "source", pKey)) != ok)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
