diff options
| author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2012-09-05 11:48:59 -0300 |
|---|---|---|
| committer | Marcello Coutinho <marcellocoutinho@gmail.com> | 2012-09-05 11:48:59 -0300 |
| commit | 4c831fa13616e99b6356db302e0088b95d4cb341 (patch) | |
| tree | cae191450c988f4ea01e4fee16497a0fda8b509a /config | |
| parent | 08f323cc1d5fa1238d1a55a6a96c9767a46d82bb (diff) | |
| download | pfsense-packages-4c831fa13616e99b6356db302e0088b95d4cb341.tar.gz pfsense-packages-4c831fa13616e99b6356db302e0088b95d4cb341.tar.bz2 pfsense-packages-4c831fa13616e99b6356db302e0088b95d4cb341.zip | |
squid3 - include dns_v4_first options that fixes https connection errors on squid3
Diffstat (limited to 'config')
| -rw-r--r-- | config/squid-reverse/squid.inc | 20 | ||||
| -rw-r--r-- | config/squid-reverse/squid.xml | 8 |
2 files changed, 17 insertions, 11 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) <b>destination</b> through the proxy server but directly through the firewall.</description> <type>checkbox</type> @@ -291,6 +291,12 @@ <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> <description>If you want to use other DNS-servers than the DNS-forwarder, enter the IPs here, separated by semi-colons (;).</description> |