stas 2003/03/24 23:51:08
Modified: src/modules/perl mod_perl.c modperl_cmd.c modperl_interp.c
Log:
move the modperl_interp_init() trace inside the function itself
Revision Changes Path
1.161 +0 -2 modperl-2.0/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- mod_perl.c 25 Mar 2003 07:49:57 -0000 1.160
+++ mod_perl.c 25 Mar 2003 07:51:08 -0000 1.161
@@ -193,8 +193,6 @@
* virtual host gets its own mip
*/
if (MpSrvPARENT(scfg) || MpSrvCLONE(scfg)) {
- MP_TRACE_i(MP_FUNC, "modperl_interp_init() server=%s\n",
- modperl_server_desc(s, p));
modperl_interp_init(s, p, perl);
}
1.42 +6 -1 modperl-2.0/src/modules/perl/modperl_cmd.c
Index: modperl_cmd.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_cmd.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- modperl_cmd.c 17 Mar 2003 06:46:55 -0000 1.41
+++ modperl_cmd.c 25 Mar 2003 07:51:08 -0000 1.42
@@ -346,7 +346,12 @@
if (modperl_init_vhost(s, p, NULL) != OK) {
return "init mod_perl vhost failed";
}
-
+
+ {
+ modperl_config_srv_t *base_scfg =
modperl_config_srv_get(modperl_global_get_server_rec());
+ }
+
+
#ifdef USE_ITHREADS
/* XXX: .htaccess support cannot use this perl with threaded MPMs */
aTHX = scfg->mip->parent->perl;
1.56 +3 -0 modperl-2.0/src/modules/perl/modperl_interp.c
Index: modperl_interp.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_interp.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- modperl_interp.c 20 Mar 2003 00:04:53 -0000 1.55
+++ modperl_interp.c 25 Mar 2003 07:51:08 -0000 1.56
@@ -226,6 +226,9 @@
pTHX;
MP_dSCFG(s);
+ MP_TRACE_i(MP_FUNC, "modperl_interp_init() server=%s\n",
+ modperl_server_desc(s, p));
+
modperl_interp_pool_t *mip =
(modperl_interp_pool_t *)apr_pcalloc(p, sizeof(*mip));
