geoff 2004/02/11 18:05:29
Modified: . Changes src/modules/perl modperl_cmd.c modperl_config.c modperl_types.h modperl_util.c todo release Added: t/htdocs/merge2 htaccess t/modperl merge.t merge2.t merge3.t t/response/TestModperl merge.pm Log: fix PerlAddVar configuration merging (short explanation, lots of work)
geoff++!
It's great to see the release file shrinking quickly ;)
but please fix the indentation in the two places below. thanks.
Index: merge.pm[...]
our %merge1 = ( 1 =>
{ PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
PerlSetEnv => [MergeSetEnv1 => 'SetEnv1Val'],
PerlSetVar => [MergeSetVar1 => 'SetVar1Val'],
PerlAddVar => [MergeAddVar1 => ['AddVar1Val1', 'AddVar1Val2']],
},
2 =>
{ PerlSetEnv => [MergeSetEnv2 => 'SetEnv2Val'],
PerlSetVar => [MergeSetVar2 => 'SetVar2Val'],
PerlAddVar => [MergeAddVar2 => ['AddVar2Val1', 'AddVar2Val2']],
},
3 =>
{ PerlSetEnv => [MergeSetEnv3 => 'SetEnv3Val'],
PerlSetVar => [MergeSetVar3 => 'SetVar3Val'],
PerlAddVar => [MergeAddVar3 => ['AddVar3Val1',
'AddVar3Val2']],
},
);
our %merge2 = ( 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
PerlSetEnv => [MergeSetEnv1 => 'SetEnv1Val'],
PerlSetVar => [MergeSetVar1 => 'SetVar1Val'],
PerlAddVar => [MergeAddVar1 => ['AddVar1Val1', 'AddVar1Val2']],
},
2 =>
{ PerlSetEnv => [MergeSetEnv2 => 'SetEnv2Merge2Val'],
PerlSetVar => [MergeSetVar2 => 'SetVar2Merge2Val'],
PerlAddVar => [MergeAddVar2 => ['AddVar2Merge2Val1',
'AddVar2Merge2Val2']],
},
3 =>
{ PerlSetEnv => [MergeSetEnv3 => 'SetEnv3Val'],
PerlSetVar => [MergeSetVar3 => 'SetVar3Val'],
PerlAddVar => [MergeAddVar3 => ['AddVar3Val1',
'AddVar3Val2']],
},
);
our %merge3 = ( 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
PerlSetEnv => [MergeSetEnv1 => 'SetEnv1Val'],
PerlSetVar => [MergeSetVar1 => 'SetVar1Val'],
PerlAddVar => [MergeAddVar1 => ['AddVar1Val1', 'AddVar1Val2']],
},
2 =>
{ PerlSetEnv => [MergeSetEnv2 => 'SetEnv2Merge2Val'],
PerlSetVar => [MergeSetVar2 => 'SetVar2Merge2Val'],
PerlAddVar => [MergeAddVar2 => ['AddVar2Merge2Val1',
'AddVar2Merge2Val2']],
},
3 =>
{ PerlSetEnv => [MergeSetEnv3 => 'SetEnv3Merge3Val'],
PerlSetVar => [MergeSetVar3 => 'SetVar3Merge3Val'],
PerlAddVar => [MergeAddVar3 => ['AddVar3Merge3Val1',
'AddVar3Merge3Val2']],
},
);
[...]
if ($location =~ m/(merge3)/) {
$hash = $1;
} elsif ($location =~ m/(merge2)/) {
$hash = $1;
} else {
$hash = 'merge1'; }
__________________________________________________________________ Stas Bekman JAm_pH ------> Just Another mod_perl Hacker http://stason.org/ mod_perl Guide ---> http://perl.apache.org mailto:[EMAIL PROTECTED] http://use.perl.org http://apacheweek.com http://modperlbook.org http://apache.org http://ticketmaster.com
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
