michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-07 03:32:04 +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
2022-09-17 16:31:37 -07:00
parent 7cb916d64d 0e974b8fcc
commit 339ec2178a
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
miniserv.pl
View File

@@ -1399,12 +1399,19 @@ elsif ($reqline !~ /^(\S+)\s+(.*)\s+HTTP\/1\..$/) {
}
local $url = $wantport == 443 ? "https://$urlhost/"
: "https://$urlhost:$wantport/";
local $jsurl = $config{'musthost'} ?
$url :
"https://'+location.host+'";
local $jsredir = $config{'musthost'} ?
"location.href='$url'" :
"location.protocol='https:'";
&http_error(200, "Document follows",
"This web server is running in SSL mode. ".
"Try the URL <a href='$url'>$url</a> instead.".
"Trying to redirect to <a href='$url'>$url</a> instead ...".
"<script>".
"if (location.protocol != 'https:') {".
" location.protocol = 'https:';".
" document.querySelector('a').href='".$jsurl."';document.querySelector('a').innerText='".$jsurl."';".
"".$jsredir."".
"}".
"</script>",
0, 1);

10
phpini/phpini-lib.pl
View File

@@ -308,6 +308,16 @@ if ($file && &get_config_fmt($file) eq "fpm" &&
&virtual_server::pop_all_print();
}
}
if ($file && &get_config_fmt($file) eq "ini" &&
&foreign_installed("virtual-server") &&
&foreign_installed("virtualmin-nginx")) {
&foreign_require("virtual-server");
&foreign_require("virtualmin-nginx", "virtual_feature.pl");
my @dom = grep { &is_under_directory($_->{'home'}, $file) }
&virtual_server::list_domains();
&virtualmin_nginx::feature_restart_web_php($dom[0])
if (@dom);
}
}
# get_config_as_user([file])