aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@pfSense.org>2014-04-03 16:41:17 -0300
committerRenato Botelho <garga@pfSense.org>2014-04-03 16:41:17 -0300
commit85e095ca0eacd798064f4ff13d8aa285e5911404 (patch)
tree3bc88a4f9a74894a837844eb5742b94159156628
parent2ba6733c7edfe1d7e1ffa0963bf2ed1d75035e55 (diff)
parentf9b4780bec0f2994c93c8cdac5c7646a9b5b6a84 (diff)
downloadpfsense-packages-85e095ca0eacd798064f4ff13d8aa285e5911404.tar.gz
pfsense-packages-85e095ca0eacd798064f4ff13d8aa285e5911404.tar.bz2
pfsense-packages-85e095ca0eacd798064f4ff13d8aa285e5911404.zip
Merge pull request #636 from PiBa-NL/hap_fix_convert_newinstall
haproxy-devel, on a new install a 'corrupted' empty array was created by the configuration conversion process.
-rw-r--r--config/haproxy-devel/haproxy.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index 8b7fbb1e..e1cfdbbe 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -405,9 +405,8 @@ EOD;
$writeconfigupdate = true;
}
// update config to "haproxy-devel 1.5-dev19 pkg v0.5"
- $a_backends = &$config['installedpackages']['haproxy']['ha_backends']['item'];
- if(is_array($a_backends)) {
- foreach ($a_backends as &$bind) {
+ if(is_array($config['installedpackages']['haproxy']['ha_backends']['item'])) {
+ foreach ($config['installedpackages']['haproxy']['ha_backends']['item'] as &$bind) {
if($bind['httpclose'] && $bind['httpclose'] == "yes" ) {
$bind['httpclose'] = "httpclose";
$writeconfigupdate = true;