diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2007-01-11 23:35:17 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2007-01-11 23:35:17 +0000 |
| commit | b328a3cc33c6f3ab7f153ead305562145a40f5ab (patch) | |
| tree | 83341b27bb45432f2cfb0c47ee480166b2598b22 | |
| parent | 40b0848cf0bc85ee5c85a75b1ae3a75494e8d09d (diff) | |
| download | pfsense-packages-b328a3cc33c6f3ab7f153ead305562145a40f5ab.tar.gz pfsense-packages-b328a3cc33c6f3ab7f153ead305562145a40f5ab.tar.bz2 pfsense-packages-b328a3cc33c6f3ab7f153ead305562145a40f5ab.zip | |
Bump to version p9
* Fix incorrect comment line
* Create single redirect line for transparent mode
| -rw-r--r-- | packages/squid/squid.inc | 11 | ||||
| -rw-r--r-- | packages/squid/squid.xml | 3 | ||||
| -rw-r--r-- | pkg_config.xml | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc index 5a716747..ebf8e702 100644 --- a/packages/squid/squid.inc +++ b/packages/squid/squid.inc @@ -381,10 +381,15 @@ function squid_resync_general() { if (($settings['transparent_proxy'] == 'on')) { $conf .= "http_port 127.0.0.1:80 transparent\n"; } - $conf .= "http_port {$real_ifaces[$i][0]}:$port\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"; + } + } } } - $icp_port = ($settings['icp_port'] ? $settings['icp_port'] : 0); $pidfile = "{$g['varrun_path']}/squid.pid"; @@ -422,7 +427,7 @@ EOD; $ip = long2ip(ip2long($ip) & ip2long($mask)); $src .= " $ip/$mask"; } - $conf .= "Allow local network(s) on interface(s)\n"; + $conf .= "# Allow local network(s) on interface(s)\n"; $conf .= "acl localnet src $src\n"; $valid_acls[] = 'localnet'; } diff --git a/packages/squid/squid.xml b/packages/squid/squid.xml index b75abb8a..e09382f2 100644 --- a/packages/squid/squid.xml +++ b/packages/squid/squid.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packagegui> <name>squid</name> - <version>2.6.5_1-p8</version> - + <version>2.6.5_1-p9</version> <include_file>/usr/local/pkg/squid.inc</include_file> <!-- Installation --> <additional_files_needed> diff --git a/pkg_config.xml b/pkg_config.xml index 342a19c3..7d218b6b 100644 --- a/pkg_config.xml +++ b/pkg_config.xml @@ -500,7 +500,7 @@ <descr>High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>2.6.5_1-p8</version> + <version>2.6.5_1-p9</version> <status>BETA</status> <required_version>1.0</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl</maintainer> |