diff options
| author | Martin Fuchs <mfuchs@pfsense.org> | 2007-10-28 20:43:47 +0000 |
|---|---|---|
| committer | Martin Fuchs <mfuchs@pfsense.org> | 2007-10-28 20:43:47 +0000 |
| commit | 93d90b03b0aaec3ef8e21dbcbc9675d63ca75f25 (patch) | |
| tree | 4ce7e98cafef28fa823426ddac5c80e8512af8bd /packages/squid | |
| parent | 08546cb82a24c51150c90ea055d973ff8568f643 (diff) | |
| download | pfsense-packages-93d90b03b0aaec3ef8e21dbcbc9675d63ca75f25.tar.gz pfsense-packages-93d90b03b0aaec3ef8e21dbcbc9675d63ca75f25.tar.bz2 pfsense-packages-93d90b03b0aaec3ef8e21dbcbc9675d63ca75f25.zip | |
squid: do not disorganize future routines
Diffstat (limited to 'packages/squid')
| -rw-r--r-- | packages/squid/squid.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc index 5b2a9ca1..89fd6b44 100644 --- a/packages/squid/squid.inc +++ b/packages/squid/squid.inc @@ -506,6 +506,7 @@ EOD; if ($settings['disable_xforward']) $conf .= "forwarded_for off\n"; if ($settings['disable_via']) $conf .= "via off\n"; if (!empty($settings['uri_whitespace'])) $conf .= "uri_whitespace {$settings['uri_whitespace']}\n"; + return $conf; } @@ -830,9 +831,8 @@ EOD; $conf .= "http_access allow password $acl\n"; } - $settings = $config['installedpackages']['squid']['config'][0]; - if(!empty($settings['custom_options'])) { - $custopts = explode(";", ($settings['custom_options'])); + if(!empty($config['installedpackages']['squid']['config'][0]['custom_options'])) { + $custopts = explode(";", ($config['installedpackages']['squid']['config'][0]['custom_options'])); $conf .= "# Custom options\n"; foreach ($custopts as $custopt) { $conf .= $custopt."\n"; |