From b1fe988f572a09e46d8ac915c117ed5d0bf9c8bc Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sun, 4 Jan 2026 13:35:24 -0800
Subject: [PATCH] Add an extra check for a manual config change that breaks the
 index

---
 apache/lang/en         | 1 +
 apache/manual_save.cgi | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/apache/lang/en b/apache/lang/en
index e5547fa79..c23ab33cf 100644
--- a/apache/lang/en
+++ b/apache/lang/en
@@ -161,6 +161,7 @@ manual_efile=Invalid Apache config file
 manual_etest=Configuration file error detected : $1
 manual_editfile=Edit config file:
 manual_switch=Edit
+manual_evirt=Virtual host could not be found after manual changes - maybe the ServerName was changed?
 
 dir_title=Per-Directory Options
 dir_proxyall=All proxy requests
diff --git a/apache/manual_save.cgi b/apache/manual_save.cgi
index 578a27f38..b6306b511 100755
--- a/apache/manual_save.cgi
+++ b/apache/manual_save.cgi
@@ -73,6 +73,14 @@ if ($config{'test_manual'}) {
 		&error(&text('manual_etest',
 			     "<pre>".&html_escape($err)."</pre>"));
 		}
+	if (defined($in{'virt'}) && !defined($in{'idx'})) {
+		undef(@get_config_cache);
+		($conf, $v) = &get_virtual_config($in{'virt'});
+		if (!$v) {
+			&copy_source_dest($temp, $file);
+			&error($text{'manual_evirt'});
+			}
+		}
 	}
 unlink($temp);
 &unlock_file($file);