From 003d04f214c8aa3515c41fa515ceede5407342bb Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Fri, 16 Sep 2022 18:45:27 +0300
Subject: [PATCH 1/5] Fix to restart Nginx in FCGId mode

---
 phpini/phpini-lib.pl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/phpini/phpini-lib.pl b/phpini/phpini-lib.pl
index bc8948e19..6a7ee8cfb 100755
--- a/phpini/phpini-lib.pl
+++ b/phpini/phpini-lib.pl
@@ -308,6 +308,15 @@ 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 { $file =~ /^$_->{'home'}\// } 
+	              &virtual_server::list_domains();
+	&virtualmin_nginx::feature_restart_web_php($dom[0]);
+	}
 }
 
 # get_config_as_user([file])

From 5c7189348209dbb5e2b6b472e7ccc061907ca1d8 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Fri, 16 Sep 2022 21:52:37 +0300
Subject: [PATCH 2/5] Fix to use `is_under_directory`

---
 phpini/phpini-lib.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpini/phpini-lib.pl b/phpini/phpini-lib.pl
index 6a7ee8cfb..93d0056f0 100755
--- a/phpini/phpini-lib.pl
+++ b/phpini/phpini-lib.pl
@@ -313,7 +313,7 @@ if ($file && &get_config_fmt($file) eq "ini" &&
 	&foreign_installed("virtualmin-nginx")) {
 	&foreign_require("virtual-server");
 	&foreign_require("virtualmin-nginx", "virtual_feature.pl");
-	my @dom = grep { $file =~ /^$_->{'home'}\// } 
+	my @dom = grep { &is_under_directory($_->{'home'}, $file) } 
 	              &virtual_server::list_domains();
 	&virtualmin_nginx::feature_restart_web_php($dom[0]);
 	}

From f0c976a9c115b7d754eaf673f70e624f5e03c804 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Sat, 17 Sep 2022 14:34:20 +0300
Subject: [PATCH 3/5] Fix to check if domains

---
 phpini/phpini-lib.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpini/phpini-lib.pl b/phpini/phpini-lib.pl
index 93d0056f0..bc2450b4a 100755
--- a/phpini/phpini-lib.pl
+++ b/phpini/phpini-lib.pl
@@ -315,7 +315,8 @@ if ($file && &get_config_fmt($file) eq "ini" &&
 	&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]);
+	&virtualmin_nginx::feature_restart_web_php($dom[0])
+	    if (@dom);
 	}
 }
 

From 5e521515d9b90acfc098d54b2d612edfee29113a Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Sat, 17 Sep 2022 21:46:57 +0300
Subject: [PATCH 4/5] Fix to use correct URL name ; consider `musthost` option

---
 miniserv.pl | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/miniserv.pl b/miniserv.pl
index 3f4780130..097e3724e 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 <a href='$url'>$url</a> instead.".
+			"Trying to redirect to <a href='$url'>$url</a> instead URL ...".
 			"<script>".
 			"if (location.protocol != 'https:') {".
-			"  location.protocol = 'https:';".
+			"  document.querySelector('a').href='".$jsurl."';document.querySelector('a').innerText='".$jsurl."';".
+			"".$jsredir."".
 			"}".
 			"</script>",
 			0, 1);

From 3747f930b0bd8e66e0842d37d933a0f82d47987d Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Sat, 17 Sep 2022 21:53:15 +0300
Subject: [PATCH 5/5] Fix wording

---
 miniserv.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/miniserv.pl b/miniserv.pl
index 097e3724e..aaf78214c 100755
--- a/miniserv.pl
+++ b/miniserv.pl
@@ -1407,7 +1407,7 @@ elsif ($reqline !~ /^(\S+)\s+(.*)\s+HTTP\/1\..$/) {
 				                   "location.protocol='https:'";
 		&http_error(200, "Document follows",
 			"This web server is running in SSL mode. ".
-			"Trying to redirect to <a href='$url'>$url</a> instead URL ...".
+			"Trying to redirect to <a href='$url'>$url</a> instead ...".
 			"<script>".
 			"if (location.protocol != 'https:') {".
 			"  document.querySelector('a').href='".$jsurl."';document.querySelector('a').innerText='".$jsurl."';".