From 4c831fa13616e99b6356db302e0088b95d4cb341 Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Wed, 5 Sep 2012 11:48:59 -0300
Subject: squid3 - include dns_v4_first options that fixes https connection
 errors on squid3

---
 config/squid-reverse/squid.inc | 20 ++++++++++----------
 config/squid-reverse/squid.xml |  8 +++++++-
 pkg_config.8.xml               |  2 +-
 pkg_config.8.xml.amd64         |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index d8b71a58..b88de284 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -771,7 +771,7 @@ function squid_resync_general() {
 		$conf .= "http_port 127.0.0.1:" . $settings['proxy_port'] . " intercept\n";
 	}
 	$icp_port = ($settings['icp_port'] ? $settings['icp_port'] : 7);
-
+	$dns_v4_first= ($settings['dns_v4_first'] == "on" ? "on" : "off" );
 	$pidfile = "{$g['varrun_path']}/squid.pid";
 	$language = ($settings['error_language'] ? $settings['error_language'] : 'en');
 	$icondir = SQUID_CONFBASE . '/icons';
@@ -787,17 +787,17 @@ function squid_resync_general() {
 	$logdir_access = ($settings['log_enabled'] == 'on' ? $logdir . '/access.log' : '/dev/null');
 
 	$conf .= <<<EOD
-icp_port $icp_port
-
-pid_filename $pidfile
+icp_port {$icp_port}
+dns_v4_first {$dns_v4_first}
+pid_filename {$pidfile}
 cache_effective_user proxy
 cache_effective_group proxy
-error_default_language $language
-icon_directory $icondir
-visible_hostname $hostname
-cache_mgr $email
-access_log $logdir_access
-cache_log $logdir_cache
+error_default_language {$language}
+icon_directory {$icondir}
+visible_hostname {$hostname}
+cache_mgr {$email}
+access_log {$logdir_access}
+cache_log {$logdir_cache}
 cache_store_log none
 sslcrtd_children 0
 
diff --git a/config/squid-reverse/squid.xml b/config/squid-reverse/squid.xml
index 1c1a8c6a..943f3ed5 100644
--- a/config/squid-reverse/squid.xml
+++ b/config/squid-reverse/squid.xml
@@ -271,7 +271,7 @@
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fielddescr>Bypass proxy for Private Address Space (RFC 1918) destination</fielddescr>
+			<fielddescr>Bypass proxy for Private Address destination</fielddescr>
 			<fieldname>private_subnet_proxy_off</fieldname>
 			<description>Do not forward traffic to Private Address Space (RFC 1918) &lt;b&gt;destination&lt;/b&gt; through the proxy server but directly through the firewall.</description>
 			<type>checkbox</type>
@@ -290,6 +290,12 @@
 			<type>input</type>
 		<size>70</size>
 		</field>
+		<field>
+			<fielddescr>Resolv dns v4 first</fielddescr>
+			<fieldname>dns_v4_first</fieldname>
+			<description><![CDATA[Enable this option to force dns v4 lookup first. This option is very usefull if you have problems to access https sites.]]></description>
+			<type>checkbox</type>
+		</field>
 		<field>
 			<fielddescr>Use alternate DNS-servers for the proxy-server</fielddescr>
 			<fieldname>dns_nameservers</fieldname>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 7d2781c9..06104252 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1187,7 +1187,7 @@
 		<pkginfolink>http://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.1.20 pkg 2.0.5_3</version>
+		<version>3.1.20 pkg 2.0.5_4</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 3bb1c37b..dc37d529 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1174,7 +1174,7 @@
 		<pkginfolink>http://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.1.20 pkg 2.0.5_3</version>
+		<version>3.1.20 pkg 2.0.5_4</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
-- 
cgit v1.2.3