diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2007-01-17 16:04:46 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2007-01-17 16:04:46 +0000 |
| commit | 032e2d431a674a9c116e04fd4d1a625375c9e3fb (patch) | |
| tree | 161d6c242ca7a10a1295f996c183d4c1a0f19c3d /packages/squid | |
| parent | 52f26ef898832ec0ddc7cd2b733d9ff470803dca (diff) | |
| download | pfsense-packages-032e2d431a674a9c116e04fd4d1a625375c9e3fb.tar.gz pfsense-packages-032e2d431a674a9c116e04fd4d1a625375c9e3fb.tar.bz2 pfsense-packages-032e2d431a674a9c116e04fd4d1a625375c9e3fb.zip | |
When not enabling transparent mode we did not create a port statement in
the config file and upsetting squid.
Diffstat (limited to 'packages/squid')
| -rw-r--r-- | packages/squid/squid.inc | 14 |
1 files changed, 4 insertions, 10 deletions
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"; |