From d77236705c29080b496cee5864498314e7531c8e Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 21 Aug 2023 16:36:19 +0200
Subject: [PATCH] Services/Web Proxy - dns_v4_first deprecated quite some time
 ago (http://www.squid-cache.org/Doc/config/dns_v4_first/)

---
 .../mvc/app/controllers/OPNsense/Proxy/forms/main.xml      | 7 -------
 src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml       | 4 ----
 src/opnsense/service/templates/OPNsense/Proxy/squid.conf   | 6 ------
 3 files changed, 17 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
index 0e565949f..1d8208b39 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
@@ -65,13 +65,6 @@
                 <allownew>true</allownew>
                 <advanced>true</advanced>
             </field>
-            <field>
-                <id>proxy.general.dnsV4First</id>
-                <label>Enable DNS v4 first</label>
-                <type>checkbox</type>
-                <help>This option reverses the order of preference to make Squid contact dual-stack websites over IPv4 first. Squid will still perform both IPv6 and IPv4 DNS lookups before connecting. This option will restrict the situations under which IPv6 connectivity is used (and tested) and will hide network problems which would otherwise be detected and warned about.</help>
-                <advanced>true</advanced>
-            </field>
             <field>
                 <id>proxy.general.useViaHeader</id>
                 <label>Use Via header</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index 65a9f0f13..819f5533d 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -55,10 +55,6 @@
                 <Required>N</Required>
                 <mask>/^([\/0-9a-fA-F.:,])*/u</mask>
             </alternateDNSservers>
-            <dnsV4First type="BooleanField">
-                <default>0</default>
-                <Required>Y</Required>
-            </dnsV4First>
             <forwardedForHandling type="OptionField">
                 <default>on</default>
                 <Required>N</Required>
diff --git a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
index 07aa61efa..b4f4cca29 100644
--- a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
+++ b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
@@ -356,12 +356,6 @@ refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
 refresh_pattern .		0	20%	4320
 
 # Squid Options
-{% if helpers.exists('OPNsense.proxy.general.dnsV4First') %}
-{%      if OPNsense.proxy.general.dnsV4First == '1' %}
-# dns_v4_first reverses the order of preference to make Squid contact dual-stack websites over IPv4 first
-dns_v4_first on
-{%      endif %}
-{% endif %}
 {% if helpers.empty('OPNsense.proxy.general.enablePinger') %}
 pinger_enable off
 {% endif %}