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

Merge branch 'master' of github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2025-04-11 22:12:18 -07:00
parent a6c3cccbac d2d16608dc
commit 535accda63
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lang/en
View File

@@ -267,7 +267,7 @@ progress_size2=Downloading $1 ($2) ..
progress_nosize=Downloading $1 ..
progress_datan=Received $1 ($2 %)
progress_data2n=Received $1
progress_done=.. download complete.
progress_done=.. download complete
progress_incache=Found $1 in cache ..
readparse_cdheader=Missing Content-Disposition header

5
web-lib-funcs.pl
View File

@@ -5255,8 +5255,11 @@ $config_file = "$config_directory/config";
%gconfig = ( );
&read_file_cached($config_file, \%gconfig);
$gconfig{'webprefix'} = '' if (!exists($gconfig{'webprefix'}));
if (!$gconfig{'webprefix'} && $gconfig{'webprefix_remote'}) {
if (!$gconfig{'webprefix'} && $gconfig{'webprefix_remote'} &&
defined($ENV{'HTTP_X_WEBMIN_WEBPREFIX'})) {
$gconfig{'webprefix'} = $ENV{'HTTP_X_WEBMIN_WEBPREFIX'};
# Filter out potentially dangerous characters
$gconfig{'webprefix'} =~ s/[^a-zA-Z0-9\.\-_\/]//g;
}
$null_file = $gconfig{'os_type'} eq 'windows' ? "NUL" : "/dev/null";
$path_separator = $gconfig{'os_type'} eq 'windows' ? ';' : ':';