stas 2004/07/07 12:01:05
Modified: . Changes
src/modules/perl mod_perl.c
Log:
Make it possible to disable mod_perl for the base server, but enable
it for the virtual hosts
Revision Changes Path
1.404 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -u -r1.403 -r1.404
--- Changes 6 Jul 2004 22:06:04 -0000 1.403
+++ Changes 7 Jul 2004 19:01:04 -0000 1.404
@@ -12,6 +12,9 @@
=item 1.99_15-dev
+Make it possible to disable mod_perl for the base server, but enable
+it for the virtual hosts [Stas]
+
Removed the deprecated path argument to $r->add_config() [Gozer]
Created a META.yml for CPAN and friends, including Apache-Test as
1.216 +3 -6 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.215
retrieving revision 1.216
diff -u -u -r1.215 -r1.216
--- mod_perl.c 25 Jun 2004 15:29:25 -0000 1.215
+++ mod_perl.c 7 Jul 2004 19:01:04 -0000 1.216
@@ -321,7 +321,9 @@
return OK;
}
- if (!MpSrvENABLE(scfg)) {
+ /* the base server could have mod_perl callbacks disabled, but it
+ * still negeds perl to drive the vhosts */
+ if (!MpSrvENABLE(scfg) && s->is_virtual) {
MP_TRACE_i(MP_FUNC, "mod_perl disabled for server %s\n", vhost);
scfg->mip = NULL;
return OK;
@@ -390,11 +392,6 @@
exit(1);
}
#endif
-
- if (!MpSrvENABLE(base_scfg)) {
- /* how silly */
- return;
- }
base_perl = modperl_startup(base_server, p);
