From 032e2d431a674a9c116e04fd4d1a625375c9e3fb Mon Sep 17 00:00:00 2001 From: Seth Mos Date: Wed, 17 Jan 2007 16:04:46 +0000 Subject: When not enabling transparent mode we did not create a port statement in the config file and upsetting squid. --- packages/squid/squid.inc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc index c7ec429a..d7f78268 100644 --- a/packages/squid/squid.inc +++ b/packages/squid/squid.inc @@ -448,18 +448,12 @@ function squid_resync_general() { foreach (explode(",", $ifaces) as $i => $iface) { $real_ifaces[] = squid_get_real_interface_address($iface); if($real_ifaces[$i][0]) { - if (($settings['transparent_proxy'] == 'on')) { - $conf .= "http_port 127.0.0.1:80 transparent\n"; - } - } else { - foreach (explode(",", $ifaces) as $i => $iface) { - $real_ifaces[] = squid_get_real_interface_address($iface); - if($real_ifaces[$i][0]) { - $conf .= "http_port {$real_ifaces[$i][0]}:$port\n"; - } - } + $conf .= "http_port {$real_ifaces[$i][0]}:$port\n"; } } + if (($settings['transparent_proxy'] == 'on')) { + $conf .= "http_port 127.0.0.1:80 transparent\n"; + } $icp_port = ($settings['icp_port'] ? $settings['icp_port'] : 0); $pidfile = "{$g['varrun_path']}/squid.pid"; -- cgit v1.2.3