diff --git a/miniserv.pl b/miniserv.pl index af3a3201e..c4069c65f 100755 --- a/miniserv.pl +++ b/miniserv.pl @@ -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 $url instead.". + "Trying to redirect to $url instead ...". "", 0, 1); diff --git a/phpini/phpini-lib.pl b/phpini/phpini-lib.pl index bc8948e19..bc2450b4a 100755 --- a/phpini/phpini-lib.pl +++ b/phpini/phpini-lib.pl @@ -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])