michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Handle case where a LoadModule is inside an IfModule block

Browse Source
This commit is contained in:
Jamie Cameron
2010-10-31 14:18:43 -07:00
parent 7bbf1cc25f
commit 583c18b5eb
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apache/apache-lib.pl
View File

@@ -34,6 +34,15 @@ if ($module_name ne 'htaccess') {
local ($ver, $mods) = &httpd_info($httpd);
if ($ver) {
local @mods = map { "$_/$ver" } &configurable_modules();
foreach my $m (@mods) {
if ($m =~ /(\S+)\/(\S+)/) {
$httpd_modules{$1} = $2;
}
}
# Call again now that known modules have been set, as
# sometimes there are dependencies due to LoadModule
# statements in an IfModule block
@mods = map { "$_/$ver" } &configurable_modules();
local %site = ( 'size' => $st[7],
'path' => $httpd,
'modules' => join(' ', @mods),
@@ -52,7 +61,9 @@ if (&read_file($site_file, \%site)) {
local($m, $f, $d);
$httpd_size = $site{'size'};
foreach $m (split(/\s+/, $site{'modules'})) {
if ($m =~ /(\S+)\/(\S+)/) { $httpd_modules{$1} = $2; }
if ($m =~ /(\S+)\/(\S+)/) {
$httpd_modules{$1} = $2;
}
}
foreach $m (keys %httpd_modules) {
if (!-r "$module_root_directory/$m.pl") {