dougm 01/09/17 16:36:36 Modified: lib/ModPerl Code.pm src/modules/perl mod_perl.c modperl_callback.c modperl_config.c Log: s/Enabled/Enable/g for the PerlOption Revision Changes Path 1.67 +2 -2 modperl-2.0/lib/ModPerl/Code.pm Index: Code.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- Code.pm 2001/09/15 22:25:55 1.66 +++ Code.pm 2001/09/17 23:36:35 1.67 @@ -91,7 +91,7 @@ my @hook_flags = (map { canon_uc($_) } keys %hooks); my @ithread_opts = qw(CLONE PARENT); my %flags = ( - Srv => ['NONE', @ithread_opts, qw(ENABLED AUTOLOAD MERGE_HANDLERS), + Srv => ['NONE', @ithread_opts, qw(ENABLE AUTOLOAD MERGE_HANDLERS), @hook_flags, 'UNSET'], Dir => [qw(NONE PARSE_HEADERS SETUP_ENV MERGE_HANDLERS GLOBAL_REQUEST UNSET)], Req => [qw(NONE SET_GLOBAL_REQUEST)], @@ -293,7 +293,7 @@ $protostr { $prototype->{cfg}->{get}; - if (!MpSrvENABLED(scfg)) { + if (!MpSrvENABLE(scfg)) { return apr_pstrcat(parms->pool, "Perl is disabled for server ", parms->server->server_hostname, NULL); 1.71 +2 -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.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- mod_perl.c 2001/09/16 01:05:44 1.70 +++ mod_perl.c 2001/09/17 23:36:35 1.71 @@ -135,7 +135,7 @@ } #endif - if (!MpSrvENABLED(base_scfg)) { + if (!MpSrvENABLE(base_scfg)) { /* how silly */ return; } @@ -170,7 +170,7 @@ #ifdef USE_ITHREADS - if (!MpSrvENABLED(scfg)) { + if (!MpSrvENABLE(scfg)) { scfg->mip = NULL; continue; } 1.43 +1 -1 modperl-2.0/src/modules/perl/modperl_callback.c Index: modperl_callback.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- modperl_callback.c 2001/05/22 22:13:20 1.42 +++ modperl_callback.c 2001/09/17 23:36:36 1.43 @@ -96,7 +96,7 @@ const char *desc = NULL; AV *av_args = Nullav; - if (!MpSrvENABLED(scfg)) { + if (!MpSrvENABLE(scfg)) { MP_TRACE_h(MP_FUNC, "PerlOff for server %s\n", s->server_hostname); return DECLINED; 1.37 +1 -1 modperl-2.0/src/modules/perl/modperl_config.c Index: modperl_config.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- modperl_config.c 2001/09/15 20:17:35 1.36 +++ modperl_config.c 2001/09/17 23:36:36 1.37 @@ -68,7 +68,7 @@ apr_pcalloc(p, sizeof(*scfg)); scfg->flags = modperl_options_new(p, MpSrvType); - MpSrvENABLED_On(scfg); /* mod_perl enabled by default */ + MpSrvENABLE_On(scfg); /* mod_perl enabled by default */ MpSrvHOOKS_ALL_On(scfg); /* all hooks enabled by default */ scfg->PerlModule = apr_array_make(p, 2, sizeof(char *));