From aad57cca7c47d2a17a00ef19999ebecd15259938 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Fri, 11 Feb 2022 22:23:23 -0800
Subject: [PATCH] No need for allow from all under Apache 2.4+

---
 apache/create_virt.cgi | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/apache/create_virt.cgi b/apache/create_virt.cgi
index 10f1621d3..efc5c85d0 100755
--- a/apache/create_virt.cgi
+++ b/apache/create_virt.cgi
@@ -217,15 +217,17 @@ push(@mems, @cmems);
 
 if ($in{'adddir'} && $in{'root'}) {
 	# Add a <Directory> section for the root
+	my @dmems;
+	if ($httpd_modules{'core'} < 2.4) {
+		push(@dmems, { 'name' => 'allow',
+			       'value' => 'from all' });
+		}
+	push(@dmems, { 'name' => 'Options',
+		       'value' => 'None' });
 	$dirsect = { 'name' => 'Directory',
 		     'value' => "\"$in{'root'}\"",
 		     'type' => 1,
-		     'members' => [
-			{ 'name' => 'allow',
-			  'value' => 'from all' },
-			{ 'name' => 'Options',
-			  'value' => 'None' },
-			],
+		     'members' => \@dmems,
 		   };
 	if ($httpd_modules{'core'} >= 2.4) {
 		# Apache 2.4+ needs a 'Require all granted' line