diff options
author | jim-p <jimp@pfsense.org> | 2013-08-13 11:29:28 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2013-08-13 11:29:28 -0400 |
commit | 3291e0ddd539dd23e3e6c7a700c8db645e3840eb (patch) | |
tree | a890347a4ef87deb9abca5c848f27a42cedb0eb5 | |
parent | d63a1616cb40dc1db3c8d78101c4a45fdb1c8caf (diff) | |
download | pfsense-packages-3291e0ddd539dd23e3e6c7a700c8db645e3840eb.tar.gz pfsense-packages-3291e0ddd539dd23e3e6c7a700c8db645e3840eb.tar.bz2 pfsense-packages-3291e0ddd539dd23e3e6c7a700c8db645e3840eb.zip |
Fix HAproxy "advanced" global pass-through options box.
-rwxr-xr-x | config/haproxy-stable/haproxy_global.php | 2 | ||||
-rwxr-xr-x | config/haproxy/haproxy_global.php | 2 | ||||
-rw-r--r-- | pkg_config.8.xml | 2 | ||||
-rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/config/haproxy-stable/haproxy_global.php b/config/haproxy-stable/haproxy_global.php index f7864a4d..0e960611 100755 --- a/config/haproxy-stable/haproxy_global.php +++ b/config/haproxy-stable/haproxy_global.php @@ -79,7 +79,7 @@ if ($_POST) { $config['installedpackages']['haproxy']['logfacility'] = $_POST['logfacility'] ? $_POST['logfacility'] : false; $config['installedpackages']['haproxy']['loglevel'] = $_POST['loglevel'] ? $_POST['loglevel'] : false; $config['installedpackages']['haproxy']['syncpassword'] = $_POST['syncpassword'] ? $_POST['syncpassword'] : false; - $config['installedpackages']['haproxy']['advanced'] = base64_encode($_POST['advanced']) ? $_POST['advanced'] : false; + $config['installedpackages']['haproxy']['advanced'] = $_POST['advanced'] ? base64_encode($_POST['advanced']) : false; $config['installedpackages']['haproxy']['nbproc'] = $_POST['nbproc'] ? $_POST['nbproc'] : false; touch($d_haproxyconfdirty_path); write_config(); diff --git a/config/haproxy/haproxy_global.php b/config/haproxy/haproxy_global.php index 5d3725e5..c09b202f 100755 --- a/config/haproxy/haproxy_global.php +++ b/config/haproxy/haproxy_global.php @@ -84,7 +84,7 @@ if ($_POST) { $config['installedpackages']['haproxy']['carpdev'] = $_POST['carpdev'] ? $_POST['carpdev'] : false; $config['installedpackages']['haproxy']['syncusername'] = $_POST['syncusername'] ? $_POST['syncusername'] : false; $config['installedpackages']['haproxy']['syncpassword'] = $_POST['syncpassword'] ? $_POST['syncpassword'] : false; - $config['installedpackages']['haproxy']['advanced'] = base64_encode($_POST['advanced']) ? $_POST['advanced'] : false; + $config['installedpackages']['haproxy']['advanced'] = $_POST['advanced'] ? base64_encode($_POST['advanced']) : false; $config['installedpackages']['haproxy']['nbproc'] = $_POST['nbproc'] ? $_POST['nbproc'] : false; touch($d_haproxyconfdirty_path); write_config(); diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 3a7b441b..4b01b9e5 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -137,7 +137,7 @@ Supports acl's for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.4.24 pkg v 1.2.1</version> + <version>1.4.24 pkg v 1.2.2</version> <status>Release</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 415bca8b..2d6a2f57 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -124,7 +124,7 @@ Supports acl's for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.4.24 pkg v 1.2.1</version> + <version>1.4.24 pkg v 1.2.2</version> <status>Release</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file> |