richter 02/05/23 22:43:15
Modified: . Tag: Embperl2c Embperl.pm epapinit.c epinit.c
epmain.c epnames.h epprovider.c
test/conf Tag: Embperl2c httpd.conf.src startup.pl
Log:
Apache 1 <-> 2 compat
Revision Changes Path
No revision
No revision
1.118.4.108 +2 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.107
retrieving revision 1.118.4.108
diff -u -r1.118.4.107 -r1.118.4.108
--- Embperl.pm 23 May 2002 22:24:45 -0000 1.118.4.107
+++ Embperl.pm 24 May 2002 05:43:14 -0000 1.118.4.108
@@ -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.118.4.107 2002/05/23 22:24:45 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.108 2002/05/24 05:43:14 richter Exp $
#
###################################################################################
@@ -46,7 +46,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '2.0b8_dev-7' ;
+$VERSION = '2.0b8_dev-8' ;
$modperl = $ENV{MOD_PERL} ;
1.1.2.39 +39 -51 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -u -r1.1.2.38 -r1.1.2.39
--- epapinit.c 23 May 2002 22:24:45 -0000 1.1.2.38
+++ epapinit.c 24 May 2002 05:43:14 -0000 1.1.2.39
@@ -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.38 2002/05/23 22:24:45 richter Exp $
+# $Id: epapinit.c,v 1.1.2.39 2002/05/24 05:43:14 richter Exp $
#
###################################################################################*/
@@ -24,8 +24,6 @@
#ifdef APACHE
#include <http_core.h>
-#include <apr_dso.h>
-#include <dlfcn.h>
#ifndef gettid
#ifdef WIN32
@@ -183,31 +181,21 @@
{
apr_pool_t * pool ;
- /*
- apr_dso_handle_sym_t ressym ;
- apr_dso_handle_t handle ;
-
- memset (handle, 0, sizeof(handle)) ;
-
- if (apr_dso_sym (&ressym, &handle, "apr_global_hook_pool") != APR_SUCCESS)
- {
- ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "Embperl: Cannot get address
of apr_global_hook_pool [%d/%d]\n", getpid(), gettid()) ;
- return ;
- }
-
- pool = *((apr_pool_t * *)(ressym)) ;
- */
-
+
#ifdef APACHE2
+ ap_log_error (APLOG_MARK, APLOG_ERR, APLOG_STATUSCODE NULL, "Embperl:
embperl_ApacheAddModule not support within Apache 2.0 [%d/%d]\n", getpid(), gettid()) ;
+ return ;
+ /*
void * p = dlsym (0, "apr_global_hook_pool") ;
if (!p)
{
- ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "Embperl: Cannot get address
of apr_global_hook_pool [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_ERR, APLOG_STATUSCODE NULL, "Embperl:
Cannot get address of apr_global_hook_pool [%d/%d]\n", getpid(), gettid()) ;
return ;
}
pool = *((apr_pool_t * *)(p)) ;
+ */
#endif
bApDebug = ap_exists_config_define("EMBPERL_APDEBUG") ;
@@ -215,7 +203,7 @@
if (!ap_find_linked_module("embperl.c"))
{
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: About to add embperl.c as dynamic module [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: About to add embperl.c as dynamic module [%d/%d]\n",
getpid(), gettid()) ;
embperl_module.name = "embperl.c" ;
#ifdef APACHE2
@@ -226,7 +214,7 @@
}
else
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: embperl.c already added as dynamic module [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: embperl.c already added as dynamic module [%d/%d]\n",
getpid(), gettid()) ;
}
@@ -247,7 +235,7 @@
#endif
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, "Embperl:
ApacheInit [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE
NULL, "Embperl: ApacheInit [%d/%d]\n", getpid(), gettid()) ;
ap_register_cleanup(subpool, NULL, embperl_ApacheInitCleanup,
embperl_ApacheInitCleanup);
#ifdef APACHE2
@@ -258,7 +246,7 @@
if ((rc = embperl_Init (aTHX_ NULL, NULL, s)) != ok)
{
- ap_log_error (APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, NULL,
"Initialization of Embperl failed (#%d)\n", rc) ;
+ ap_log_error (APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, APLOG_STATUSCODE NULL,
"Initialization of Embperl failed (#%d)\n", rc) ;
}
#ifdef APACHE2
return APR_SUCCESS ;
@@ -280,19 +268,19 @@
if (m -> dynamic_load_handle)
{
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: ApacheInitCleanup: mod_perl.c dynamicly loaded -> remove embperl.c
[%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: ApacheInitCleanup: mod_perl.c dynamicly loaded ->
remove embperl.c [%d/%d]\n", getpid(), gettid()) ;
ap_remove_module (&embperl_module) ;
}
else
{
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: ApacheInitCleanup: mod_perl.c not dynamic loaded [%d/%d]\n", getpid(),
gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: ApacheInitCleanup: mod_perl.c not dynamic loaded
[%d/%d]\n", getpid(), gettid()) ;
}
}
else
{
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: ApacheInitCleanup: mod_perl.c not found [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: ApacheInitCleanup: mod_perl.c not found [%d/%d]\n",
getpid(), gettid()) ;
}
#ifdef APACHE2
@@ -312,7 +300,7 @@
cfg -> bUseEnv = -1 ;
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, "Embperl:
create_dir_config [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE
NULL, "Embperl: create_dir_config [%d/%d]\n", getpid(), gettid()) ;
return cfg;
}
@@ -329,7 +317,7 @@
cfg -> bUseEnv = -1 ;
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, "Embperl:
create_server_config [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE
NULL, "Embperl: create_server_config [%d/%d]\n", getpid(), gettid()) ;
return cfg;
@@ -368,12 +356,12 @@
mrg -> set_##STRUCT##NAME = 1 ; \
mrg -> STRUCT.NAME = add -> STRUCT.NAME ; \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Merge "#CFGNAME" (type="#TYPE") => %d\n", mrg -> STRUCT.NAME) ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Merge "#CFGNAME" (type="#TYPE") => %d\n", mrg ->
STRUCT.NAME) ; \
} \
else \
{ \
if (bApDebug && mrg -> set_##STRUCT##NAME) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Merge "#CFGNAME" (type="#TYPE") stays %d\n", mrg -> STRUCT.NAME) ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Merge "#CFGNAME" (type="#TYPE") stays %d\n", mrg ->
STRUCT.NAME) ; \
}
#define EPCFG_STR(STRUCT,TYPE,NAME,CFGNAME) \
@@ -382,12 +370,12 @@
mrg -> set_##STRUCT##NAME = 1 ; \
mrg -> STRUCT.NAME = add -> STRUCT.NAME ; \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Merge "#CFGNAME" (type="#TYPE") => %s\n", mrg -> STRUCT.NAME?mrg ->
STRUCT.NAME:"<null>") ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Merge "#CFGNAME" (type="#TYPE") => %s\n", mrg ->
STRUCT.NAME?mrg -> STRUCT.NAME:"<null>") ; \
} \
else \
{ \
if (bApDebug && mrg -> set_##STRUCT##NAME) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Merge "#CFGNAME" (type="#TYPE") stays %s\n", mrg -> STRUCT.NAME?mrg ->
STRUCT.NAME:"<null>") ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Merge "#CFGNAME" (type="#TYPE") stays %s\n", mrg ->
STRUCT.NAME?mrg -> STRUCT.NAME:"<null>") ; \
}
#undef EPCFG_SAVE
@@ -398,12 +386,12 @@
mrg -> STRUCT.NAME = add -> STRUCT.NAME ; \
mrg -> save_##STRUCT##NAME = add -> save_##STRUCT##NAME ; \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Merge "#CFGNAME" (type="#TYPE") => %s\n", mrg -> save_##STRUCT##NAME?mrg ->
save_##STRUCT##NAME:"<null>") ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Merge "#CFGNAME" (type="#TYPE") => %s\n", mrg ->
save_##STRUCT##NAME?mrg -> save_##STRUCT##NAME:"<null>") ; \
} \
else \
{ \
if (bApDebug && mrg -> set_##STRUCT##NAME) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, "Embperl:
Merge "#CFGNAME" (type="#TYPE") stays %s\n", mrg -> save_##STRUCT##NAME?mrg ->
save_##STRUCT##NAME:"<null>") ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE
NULL, "Embperl: Merge "#CFGNAME" (type="#TYPE") stays %s\n", mrg ->
save_##STRUCT##NAME?mrg -> save_##STRUCT##NAME:"<null>") ; \
}
@@ -421,7 +409,7 @@
memcpy (mrg, base, sizeof (*mrg)) ;
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: merge_dir/server_config\n") ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: merge_dir/server_config\n") ;
#include "epcfg.h"
@@ -440,7 +428,7 @@
{
((tApacheDirConfig *)pDirCfg) -> bUseEnv = arg ;
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, "Embperl:
Set UseEnv = %d\n", arg) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE
NULL, "Embperl: Set UseEnv = %d\n", arg) ;
return NULL;
}
@@ -459,18 +447,18 @@
{
*ppConfig = (tApacheDirConfig *)
ap_get_module_config(r->per_dir_config, &embperl_module);
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: GetApacheConfig for dir\n") ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: GetApacheConfig for dir\n") ;
}
else if(s && s->lookup_defaults) /*s->module_config)*/
{
*ppConfig = (tApacheDirConfig *)
ap_get_module_config(s->lookup_defaults /*s->module_config*/, &embperl_module);
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: GetApacheConfig for server\n") ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: GetApacheConfig for server\n") ;
}
}
else
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: GetApacheConfig -> no config available for %s\n",r &&
r->per_dir_config?"dir":"server" ) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: GetApacheConfig -> no config available for %s\n",r &&
r->per_dir_config?"dir":"server" ) ;
return ok ;
}
@@ -496,11 +484,11 @@
#define EPCFG(STRUCT,TYPE,NAME,CFGNAME) \
if (bApDebug && pDirCfg -> set_##STRUCT##NAME) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Get "#CFGNAME" (type="#TYPE") stays %d\n", pDirCfg -> STRUCT.NAME) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Get "#CFGNAME" (type="#TYPE") stays %d\n", pDirCfg ->
STRUCT.NAME) ;
#define EPCFG_STR(STRUCT,TYPE,NAME,CFGNAME) \
if (bApDebug && pDirCfg -> set_##STRUCT##NAME) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Get "#CFGNAME" (type="#TYPE") %s\n", pDirCfg -> STRUCT.NAME?pDirCfg ->
STRUCT.NAME:"<null>") ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Get "#CFGNAME" (type="#TYPE") %s\n", pDirCfg ->
STRUCT.NAME?pDirCfg -> STRUCT.NAME:"<null>") ;
@@ -509,7 +497,7 @@
if (pDirCfg -> save_##STRUCT##NAME && !pDirCfg -> STRUCT.NAME) \
{ \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Get, about to convert "#CFGNAME" (type="#TYPE";SV) to perl data\n") ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Get, about to convert "#CFGNAME" (type="#TYPE";SV) to
perl data\n") ; \
\
pDirCfg -> STRUCT.NAME = newSVpv((char *)pDirCfg -> save_##STRUCT##NAME, 0)
; \
}
@@ -520,7 +508,7 @@
{ \
int rc ;\
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Get, about to convert "#CFGNAME" (type="#TYPE";CV) to perl data\n") ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Get, about to convert "#CFGNAME" (type="#TYPE";CV) to
perl data\n") ; \
\
if ((rc = EvalConfig (pApp, sv_2mortal(newSVpv(pDirCfg ->
save_##STRUCT##NAME, 0)), 0, NULL, "Configuration: EMBPERL_"#CFGNAME, &pDirCfg ->
STRUCT.NAME)) != ok) \
LogError (pReq, rc) ; \
@@ -533,7 +521,7 @@
if (pDirCfg -> save_##STRUCT##NAME && !pDirCfg -> STRUCT.NAME) \
{ \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Get, about to convert "#CFGNAME" (type="#TYPE";AV) to perl data\n") ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Get, about to convert "#CFGNAME" (type="#TYPE";AV) to
perl data\n") ; \
\
pDirCfg -> STRUCT.NAME = embperl_String2AV(pApp, pDirCfg ->
save_##STRUCT##NAME, SEPARATOR) ;\
tainted = 0 ; \
@@ -545,7 +533,7 @@
if (pDirCfg -> save_##STRUCT##NAME && !pDirCfg -> STRUCT.NAME) \
{ \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Get, about to convert "#CFGNAME" (type="#TYPE";HV) to perl data\n") ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Get, about to convert "#CFGNAME" (type="#TYPE";HV) to
perl data\n") ; \
\
pDirCfg -> STRUCT.NAME = embperl_String2HV(pApp, pDirCfg ->
save_##STRUCT##NAME, ' ', NULL) ;\
tainted = 0 ; \
@@ -558,7 +546,7 @@
{ \
int rc ; \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL,
"Embperl: Get, about to convert "#CFGNAME" (type="#TYPE";REGEX) to perl data\n") ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE NULL, "Embperl: Get, about to convert "#CFGNAME" (type="#TYPE";REGEX)
to perl data\n") ; \
\
if ((rc = EvalRegEx (pApp, pDirCfg -> save_##STRUCT##NAME, "Configuration:
EMBPERL_"#CFGNAME, &pDirCfg -> STRUCT.NAME)) != ok) \
return rc ; \
@@ -746,7 +734,7 @@
((tApacheDirConfig *)pDirCfg) -> STRUCT.NAME = (TYPE)strtol(arg, NULL, 0) ; \
((tApacheDirConfig *)pDirCfg) -> set_##STRUCT##NAME = 1 ; \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, "Embperl:
Set "#CFGNAME" (type="#TYPE";INT) = %s\n", arg) ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE
NULL, "Embperl: Set "#CFGNAME" (type="#TYPE";INT) = %s\n", arg) ; \
return NULL; \
}
@@ -757,7 +745,7 @@
((tApacheDirConfig *)pDirCfg) -> STRUCT.NAME = (TYPE)arg ; \
((tApacheDirConfig *)pDirCfg) -> set_##STRUCT##NAME = 1 ; \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, "Embperl:
Set "#CFGNAME" (type="#TYPE";BOOL) = %s\n", arg) ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE
NULL, "Embperl: Set "#CFGNAME" (type="#TYPE";BOOL) = %s\n", arg) ; \
return NULL; \
}
@@ -770,7 +758,7 @@
((tApacheDirConfig *)pDirCfg) -> STRUCT.NAME = ap_pstrdup(p, arg) ; \
((tApacheDirConfig *)pDirCfg) -> set_##STRUCT##NAME = 1 ; \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, "Embperl:
Set "#CFGNAME" (type="#TYPE";STR) = %s\n", arg) ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE
NULL, "Embperl: Set "#CFGNAME" (type="#TYPE";STR) = %s\n", arg) ; \
return NULL; \
}
@@ -781,7 +769,7 @@
((tApacheDirConfig *)pDirCfg) -> STRUCT.NAME = (TYPE)arg[0] ; \
((tApacheDirConfig *)pDirCfg) -> set_##STRUCT##NAME = 1 ; \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, "Embperl:
Set "#CFGNAME" (type="#TYPE";CHAR) = %s\n", arg) ; \
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE
NULL, "Embperl: Set "#CFGNAME" (type="#TYPE";CHAR) = %s\n", arg) ; \
return NULL; \
}
@@ -803,7 +791,7 @@
((tApacheDirConfig *)pDirCfg) -> save_##STRUCT##NAME = ap_pstrdup(cmd -> pool,
arg) ; \
((tApacheDirConfig *)pDirCfg) -> set_##STRUCT##NAME = 1 ; \
if (bApDebug) \
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, NULL, "Embperl:
Set "#CFGNAME" (type="#TYPE") = %s (save for later conversion to Perl data)\n", arg) ;
\
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE
NULL, "Embperl: Set "#CFGNAME" (type="#TYPE") = %s (save for later conversion to Perl
data)\n", arg) ; \
return NULL ; \
}
1.1.2.53 +6 -4 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.52
retrieving revision 1.1.2.53
diff -u -r1.1.2.52 -r1.1.2.53
--- epinit.c 23 May 2002 22:24:45 -0000 1.1.2.52
+++ epinit.c 24 May 2002 05:43:14 -0000 1.1.2.53
@@ -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.52 2002/05/23 22:24:45 richter Exp $
+# $Id: epinit.c,v 1.1.2.53 2002/05/24 05:43:14 richter Exp $
#
###################################################################################*/
@@ -265,6 +265,7 @@
return rcEvalErr ;
}
+ SPAGAIN;
PUSHMARK(sp);
XPUSHs(sv_2mortal(newSVpv(sPackage, 0)));
XPUSHs(&sv_undef); /* id */
@@ -1337,23 +1338,23 @@
if (r -> sSessionUserID)
{
tainted = 0 ;
+ SPAGAIN;
PUSHMARK(sp);
XPUSHs(pApp -> pUserObj);
XPUSHs(sv_2mortal(newSVpv(r -> sSessionUserID, 0)));
PUTBACK;
perl_call_method ("setid", 0) ;
- SPAGAIN ;
}
if (r -> sSessionStateID)
{
tainted = 0 ;
+ SPAGAIN;
PUSHMARK(sp);
XPUSHs(pApp -> pStateObj);
XPUSHs(sv_2mortal(newSVpv(r -> sSessionStateID, 0)));
PUTBACK;
perl_call_method ("setid", 0) ;
- SPAGAIN ;
}
@@ -1365,12 +1366,12 @@
if (pApp -> Config.sAppHandlerClass)
{
tainted = 0 ;
+ SPAGAIN ;
PUSHMARK(sp);
XPUSHs(pApp -> _perlsv);
PUTBACK;
perl_call_method ("init", G_EVAL) ;
tainted = 0 ;
- SPAGAIN ;
if (SvTRUE (ERRSV))
{
@@ -1590,6 +1591,7 @@
if (r -> nSessionMgnt)
{
+ SPAGAIN ;
PUSHMARK(sp);
XPUSHs(pApp -> pAppObj);
PUTBACK;
1.75.4.119 +5 -3 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.118
retrieving revision 1.75.4.119
diff -u -r1.75.4.118 -r1.75.4.119
--- epmain.c 23 May 2002 22:24:46 -0000 1.75.4.118
+++ epmain.c 24 May 2002 05:43:14 -0000 1.75.4.119
@@ -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.118 2002/05/23 22:24:46 richter Exp $
+# $Id: epmain.c,v 1.75.4.119 2002/05/24 05:43:14 richter Exp $
#
###################################################################################*/
@@ -243,9 +243,9 @@
if (r && r -> pApacheReq)
#ifdef APLOG_ERR
if (rc != rcPerlWarn)
- ap_log_error (APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r -> pApacheReq
-> server, "%s", sText) ;
+ ap_log_error (APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, APLOG_STATUSCODE r
-> pApacheReq -> server, "%s", sText) ;
else
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, r ->
pApacheReq -> server, "%s", sText) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
APLOG_STATUSCODE r -> pApacheReq -> server, "%s", sText) ;
#else
log_error (sText, r -> pApacheReq -> server) ;
#endif
@@ -772,6 +772,7 @@
oRollbackOutput (r, NULL) ; /* forget everything outputed so far */
oBegin (r) ;
+ SPAGAIN ;
PUSHMARK(sp);
XPUSHs(r -> pApp -> _perlsv) ;
XPUSHs(r -> _perlsv) ;
@@ -1143,6 +1144,7 @@
XPUSHs(sCaller) ;
PUTBACK;
perl_call_method ("export", G_SCALAR | G_EVAL) ;
+ SPAGAIN ;
if (SvTRUE (ERRSV))
{
STRLEN l ;
1.19.4.23 +9 -1 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.19.4.22
retrieving revision 1.19.4.23
diff -u -r1.19.4.22 -r1.19.4.23
--- epnames.h 23 May 2002 22:24:46 -0000 1.19.4.22
+++ epnames.h 24 May 2002 05:43:15 -0000 1.19.4.23
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epnames.h,v 1.19.4.22 2002/05/23 22:24:46 richter Exp $
+# $Id: epnames.h,v 1.19.4.23 2002/05/24 05:43:15 richter Exp $
#
###################################################################################*/
@@ -481,3 +481,11 @@
#endif
+
+#ifdef APACHE
+#define APLOG_STATUSCODE
+#endif
+
+#ifdef APACHE2
+#define APLOG_STATUSCODE 0,
+#endif
\ No newline at end of file
1.1.2.34 +2 -1 embperl/Attic/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epprovider.c,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- epprovider.c 20 May 2002 07:04:24 -0000 1.1.2.33
+++ epprovider.c 24 May 2002 05:43:15 -0000 1.1.2.34
@@ -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.33 2002/05/20 07:04:24 richter Exp $
+# $Id: epprovider.c,v 1.1.2.34 2002/05/24 05:43:15 richter Exp $
#
###################################################################################*/
@@ -888,6 +888,7 @@
pSyntaxPV = sv_2mortal(newSVpv ((char *)sSyntax, 0)) ;
+ SPAGAIN ;
PUSHMARK(sp);
XPUSHs(pSyntaxPV);
PUTBACK;
No revision
No revision
1.24.4.60 +3 -3 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.59
retrieving revision 1.24.4.60
diff -u -r1.24.4.59 -r1.24.4.60
--- httpd.conf.src 23 May 2002 22:24:47 -0000 1.24.4.59
+++ httpd.conf.src 24 May 2002 05:43:15 -0000 1.24.4.60
@@ -31,11 +31,11 @@
print OFH "Listen ", $EPPORT + 4, "\n" ;
print OFH "Listen ", $EPPORT + 5, "\n" ;
+print OFH "$EPMODPERL\n" ;
+print OFH "LoadModule embperl_module
\"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
+
print OFH <<EOD ;
-
-$EPMODPERL
-LoadModule embperl_module \"$EPPATH/blib/arch/auto/Embperl/Embperl.so"
DirectoryIndex index.htm
1.9.6.14 +1 -1 embperl/test/conf/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup.pl,v
retrieving revision 1.9.6.13
retrieving revision 1.9.6.14
diff -u -r1.9.6.13 -r1.9.6.14
--- startup.pl 23 May 2002 22:24:47 -0000 1.9.6.13
+++ startup.pl 24 May 2002 05:43:15 -0000 1.9.6.14
@@ -17,7 +17,7 @@
} ;
-use Apache::ServerUtil ;
+#use Apache::ServerUtil ;
use Embperl ;
use Embperl::Object ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
