diff options
| author | Martin Fuchs <mfuchs@pfsense.org> | 2008-11-17 21:51:51 +0000 |
|---|---|---|
| committer | Martin Fuchs <mfuchs@pfsense.org> | 2008-11-17 21:51:51 +0000 |
| commit | 9630abcc91745b88b576b648229bed25a8865cc8 (patch) | |
| tree | 9e9b7ed8f703334521613cd7c9a5a6286d11691a | |
| parent | ae2e3aa5db87b9aebb1b2c3a92386b630f9435b5 (diff) | |
| download | pfsense-packages-9630abcc91745b88b576b648229bed25a8865cc8.tar.gz pfsense-packages-9630abcc91745b88b576b648229bed25a8865cc8.tar.bz2 pfsense-packages-9630abcc91745b88b576b648229bed25a8865cc8.zip | |
Another squid can't accept empty log rotate option
Thanks to dvserg
| -rw-r--r-- | packages/squid/squid.inc | 2 | ||||
| -rw-r--r-- | packages/squid3/squid.inc | 2 | ||||
| -rw-r--r-- | pkg_config.7.xml | 4 | ||||
| -rw-r--r-- | pkg_config.xml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc index 2f7f652a..456524e2 100644 --- a/packages/squid/squid.inc +++ b/packages/squid/squid.inc @@ -298,7 +298,7 @@ function squid_validate_general($post, $input_errors) { $input_errors[] = "That is not a valid log location dir"; $log_rotate = trim($post['log_rotate']); - if (!empty($log_rotate) && !is_numeric($log_rotate) or ($log_rotate < 1)) + if (!empty($log_rotate) && (!is_numeric($log_rotate) or ($log_rotate < 1))) $input_errors[] = 'You must enter a valid number of days \'Log rotate\' field'; $webgui_port = $config['system']['webgui']['port']; diff --git a/packages/squid3/squid.inc b/packages/squid3/squid.inc index e4cb082c..827ce903 100644 --- a/packages/squid3/squid.inc +++ b/packages/squid3/squid.inc @@ -299,7 +299,7 @@ function squid_validate_general($post, $input_errors) { $input_errors[] = "That is not a valid log location dir"; $log_rotate = trim($post['log_rotate']); - if (!empty($log_rotate) && !is_numeric($log_rotate) or ($log_rotate < 1)) + if (!empty($log_rotate) && (!is_numeric($log_rotate) or ($log_rotate < 1))) $input_errors[] = 'You must enter a valid number of days \'Log rotate\' field'; $webgui_port = $config['system']['webgui']['port']; diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 39ce6e03..14dc4d0c 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -346,7 +346,7 @@ <descr>High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>2.6.21_06</version> + <version>2.6.21_07</version> <status>Stable</status> <required_version>1.2.1</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer> @@ -362,7 +362,7 @@ <descr>EXPERIMANTAL! Not all directives are ported yet! High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>3.0.8_05</version> + <version>3.0.8_06</version> <status>ALPHA</status> <required_version>1.2.1</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer> diff --git a/pkg_config.xml b/pkg_config.xml index fd460dbf..1a43d808 100644 --- a/pkg_config.xml +++ b/pkg_config.xml @@ -515,7 +515,7 @@ <descr>High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>2.6.18.1_06</version> + <version>2.6.18.1_07</version> <status>Stable</status> <required_version>1.0</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer> |