dougm 2002/10/06 19:05:43 Modified: . Changes lib/ModPerl TestRun.pm src/modules/perl mod_perl.c modperl_cmd.c Log: rename overloaded LoadModule directive to PerlLoadModule Revision Changes Path 1.50 +2 -0 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- Changes 27 Sep 2002 19:41:50 -0000 1.49 +++ Changes 7 Oct 2002 02:05:43 -0000 1.50 @@ -10,6 +10,8 @@ =item 1.99_08-dev +rename overloaded LoadModule directive to PerlLoadModule + =item 1.99_07 - September 25, 2002 fix =pod directive test config problem 1.5 +1 -1 modperl-2.0/lib/ModPerl/TestRun.pm Index: TestRun.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/ModPerl/TestRun.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TestRun.pm 27 Sep 2002 19:33:32 -0000 1.4 +++ TestRun.pm 7 Oct 2002 02:05:43 -0000 1.5 @@ -38,7 +38,7 @@ #XXX: this should only be done for the modperl-2.0 tests $self->postamble(<<'EOF'); -LoadModule TestDirective::loadmodule +PerlLoadModule TestDirective::loadmodule MyTest one two ServerTest per-server 1.142 +1 -1 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.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- mod_perl.c 17 Sep 2002 02:05:21 -0000 1.141 +++ mod_perl.c 7 Oct 2002 02:05:43 -0000 1.142 @@ -636,7 +636,7 @@ MP_CMD_DIR_RAW_ARGS_ON_READ("=cut", pod_cut, "End of POD"), MP_CMD_DIR_RAW_ARGS_ON_READ("__END__", END, "Stop reading config"), - MP_CMD_SRV_RAW_ARGS("LoadModule", load_module, "A Perl module"), + MP_CMD_SRV_RAW_ARGS("PerlLoadModule", load_module, "A Perl module"), #ifdef MP_TRACE MP_CMD_SRV_TAKE1("PerlTrace", trace, "Trace level"), #endif 1.31 +1 -5 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.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- modperl_cmd.c 16 Sep 2002 19:14:16 -0000 1.30 +++ modperl_cmd.c 7 Oct 2002 02:05:43 -0000 1.31 @@ -383,11 +383,7 @@ server_rec *s = parms->server; const char *errmsg; - if (!ap_strstr_c(arg, "::")) { - return DECLINE_CMD; /* let mod_so handle it */ - } - - MP_TRACE_d(MP_FUNC, "LoadModule %s\n", arg); + MP_TRACE_d(MP_FUNC, "LoadPerlModule %s\n", arg); /* we must init earlier than normal */ modperl_run(p, s);