michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-09 16:52:19 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use PID variable to detect miniserv as well

Browse Source
This commit is contained in:
Jamie Cameron
2011-08-13 13:25:04 -07:00
parent 9dd3a2f49b
commit fd620c407b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web-lib-funcs.pl
View File

@@ -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;
}