equal
deleted
inserted
replaced
1 --- mod_perl-2.0.4/Apache-Test/lib/Apache/TestConfigParse.pm Sun Nov 11 21:34:46 2007 |
1 Patch origin: in-house |
2 +++ mod_perl-2.0.4/Apache-Test/lib/Apache/TestConfigParse.pm Thu May 19 05:35:01 2011 |
2 Patch status: Solaris-specific; not suitable for upstream |
3 @@ -211,6 +211,11 @@ |
3 |
|
4 This change makes sure that 64 bit modules and mod_fcgid module are not |
|
5 used for testing. Mod_fcgid is disabled because it by default creates |
|
6 shared memory and socket in paths which are not suitable for ordinary |
|
7 user (or there can be interaction with running Apache). |
|
8 |
|
9 --- mod_perl-2.0.4/Apache-Test/lib/Apache/TestConfigParse.pm |
|
10 +++ mod_perl-2.0.4/Apache-Test/lib/Apache/TestConfigParse.pm |
|
11 @@ -211,6 +211,16 @@ |
4 for my $args (@{ $c->{$directive} }) { |
12 for my $args (@{ $c->{$directive} }) { |
5 my $modname = $args->[0]; |
13 my $modname = $args->[0]; |
6 my $file = $self->server_file_rel2abs($args->[1]); |
14 my $file = $self->server_file_rel2abs($args->[1]); |
7 + |
15 + |
8 + unless ($file !~ m/\/64\//) { |
16 + unless ($file !~ m/\/64\//) { |
9 + debug "$file is 64 bit module (we don't want it)"; |
17 + debug "$file is 64 bit module (we don't want it)"; |
|
18 + next; |
|
19 + } |
|
20 + |
|
21 + unless ($file !~ m/mod_fcgid.so/) { |
|
22 + debug "$file creates shared memory and sockets on wrong place (skipping)"; |
10 + next; |
23 + next; |
11 + } |
24 + } |
12 |
25 |
13 unless (-e $file) { |
26 unless (-e $file) { |
14 debug "$file does not exist, skipping LoadModule"; |
27 debug "$file does not exist, skipping LoadModule"; |