stas 2004/01/09 21:01:04
Modified: src/modules/perl mod_perl.c
. Changes
Log:
make sure DynaLoader is loaded before XSLoader, not only with perl
5.6.1, but always because of the issues with <Perl> sections are
loaded from +Parent vhost
Revision Changes Path
1.206 +2 -3 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.205
retrieving revision 1.206
diff -u -u -r1.205 -r1.206
--- mod_perl.c 15 Dec 2003 08:24:57 -0000 1.205
+++ mod_perl.c 10 Jan 2004 05:01:04 -0000 1.206
@@ -70,13 +70,12 @@
/* outside mod_perl this is done by ModPerl::Const.xs */
newXS("ModPerl::Const::compile", XS_modperl_const_compile, __FILE__);
-#ifdef MP_PERL_5_6_x
/* make sure DynaLoader is loaded before XSLoader
- * to workaround bug in 5.6.1 that can trigger a segv
+ * - to workaround bug in 5.6.1 that can trigger a segv
* when using modperl as a dso
+ * - also needed when <Perl> sections are loaded from +Parent vhost
*/
modperl_require_module(aTHX_ "DynaLoader", FALSE);
-#endif
IoFLUSH_on(PL_stderrgv); /* unbuffer STDERR */
}
1.299 +4 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -u -r1.298 -r1.299
--- Changes 10 Jan 2004 02:52:20 -0000 1.298
+++ Changes 10 Jan 2004 05:01:04 -0000 1.299
@@ -12,6 +12,10 @@
=item 1.99_13-dev
+make sure DynaLoader is loaded before XSLoader, not only with perl
+5.6.1, but always because of the issues with <Perl> sections are
+loaded from +Parent vhost [Stas]
+
added ($r|$s)->is_perl_option_enabled($option_name), to test for
PerlOptions + tests [Stas]
