From fd620c407b53b7b4f67f8a7f454bb8819442bc2e Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 13 Aug 2011 13:25:04 -0700
Subject: [PATCH] Use PID variable to detect miniserv as well

---
 web-lib-funcs.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 7596cbdb2..83cfb5d8e 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -1869,7 +1869,8 @@ my ($nowait) = @_;
 return undef if (&is_readonly_mode());
 my %miniserv;
 &get_miniserv_config(\%miniserv) || return;
-if ($main::webmin_script_type eq 'web' && !$ENV{"MINISERV_CONFIG"}) {
+if ($main::webmin_script_type eq 'web' && !$ENV{"MINISERV_CONFIG"} &&
+    !$ENV{'MINISERV_PID'}) {
 	# Running under some web server other than miniserv, so do nothing
 	return;
 	}
@@ -1949,7 +1950,8 @@ sub reload_miniserv
 return undef if (&is_readonly_mode());
 my %miniserv;
 &get_miniserv_config(\%miniserv) || return;
-if ($main::webmin_script_type eq 'web' && !$ENV{"MINISERV_CONFIG"}) {
+if ($main::webmin_script_type eq 'web' && !$ENV{"MINISERV_CONFIG"} &&
+    !$ENV{'MINISERV_PID'}) {
 	# Running under some web server other than miniserv, so do nothing
 	return;
 	}