michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-09-11 16:10:38 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

When editing a .htaccess file, don't update the file tracking when the master apache config was changed
Some checks failed
Close inactive / close-inactive (push) Has been cancelled
Details
Package and upload artifacts / build (push) Has been cancelled
Details
Tests / prove (push) Has been cancelled
Details

Browse Source 
https://github.com/virtualmin/virtualmin-gpl/issues/1276
This commit is contained in:
Jamie Cameron
2026-09-01 21:20:47 -07:00
parent d14ab9a4e6
commit e3d6fa3c0a
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apache/apache-lib.pl
View File

@@ -548,11 +548,16 @@ return wantarray ? ($c, $v) : $c;
}
# get_htaccess_config(file)
# Parses a .htaccess format file into a list of config objects
sub get_htaccess_config
{
local($lnum, @conf);
&open_readfile(HTACCESS, $_[0]);
@conf = &parse_config_file(HTACCESS, $lnum, $_[0]);
my ($file) = @_;
my ($lnum, @conf);
&open_readfile(HTACCESS, $file);
@conf = &parse_config_file(HTACCESS, $lnum, $file);
foreach my $c (@conf) {
$c->{'htaccess'} = 1;
}
close(HTACCESS);
return \@conf;
}
@@ -650,7 +655,9 @@ for($i=0; $i<@old || $i<@{$_[1]}; $i++) {
$change = $old[$i];
}
}
&update_last_config_change();
if (!$_[3]->[0]->{'htaccess'}) {
&update_last_config_change();
}
@files = &unique(@files);
push(@{$saved_conf_files}, @files);
return @files;
@@ -745,7 +752,9 @@ elsif (!$olddir && $newdir) {
$newdir->{'file'});
}
}
&update_last_config_change();
if (!$conf->[0]->{'htaccess'}) {
&update_last_config_change();
}
}
# recursive_set_indent(&directive, indent)