dougm 01/03/14 20:34:04
Modified: src/modules/perl mod_perl.c modperl_interp.c
Log:
need to PERL_SET_CONTEXT to parent perl in non-threaded mpms
give a little more trace info about interpreters in virtual hosts
Revision Changes Path
1.36 +3 -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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_perl.c 2001/03/15 02:17:35 1.35
+++ mod_perl.c 2001/03/15 04:34:04 1.36
@@ -98,8 +98,9 @@
/* if alloc flags is On, virtual host gets its own parent perl */
if (MpSrvPARENT(scfg)) {
perl = modperl_startup(s, p);
- MP_TRACE_i(MP_FUNC, "modperl_startup() server=%s\n",
- s->server_hostname);
+ MP_TRACE_i(MP_FUNC,
+ "created parent interpreter for VirtualHost %s\n",
+ modperl_server_desc(s, p));
}
#ifdef USE_ITHREADS
1.24 +6 -2 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- modperl_interp.c 2001/03/15 02:17:35 1.23
+++ modperl_interp.c 2001/03/15 04:34:04 1.24
@@ -215,8 +215,12 @@
modperl_interp_lifetime_e lifetime;
if (!scfg->threaded_mpm) {
- MP_TRACE_i(MP_FUNC, "using parent 0x%lx for non-threaded mpm\n",
- (unsigned long)scfg->mip->parent);
+ MP_TRACE_i(MP_FUNC,
+ "using parent 0x%lx for non-threaded mpm (%s:%d)\n",
+ (unsigned long)scfg->mip->parent,
+ s->server_hostname, s->port);
+ /* XXX: if no VirtualHosts w/ PerlOptions +Parent we can skip this */
+ PERL_SET_CONTEXT(scfg->mip->parent->perl);
return scfg->mip->parent;
}
