aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthompsa <andy@fud.org.nz>2010-03-04 20:00:43 +1300
committerthompsa <andy@fud.org.nz>2010-03-04 20:00:43 +1300
commit1569952654e988b44cd8a6bc6d329a28025db8c9 (patch)
treed084e26534ea681b30c0bc3612d84b4478a7cf53
parentc7c6a092ff24b9a988299545d791e8e020d84861 (diff)
downloadpfsense-packages-1569952654e988b44cd8a6bc6d329a28025db8c9.tar.gz
pfsense-packages-1569952654e988b44cd8a6bc6d329a28025db8c9.tar.bz2
pfsense-packages-1569952654e988b44cd8a6bc6d329a28025db8c9.zip
The $bind=&$array variable from one loop seems to be truncated by using the same
named variable in the next loop. The last array member is duplicated by array[n-1].
-rw-r--r--config/haproxy-dev/haproxy.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/config/haproxy-dev/haproxy.inc b/config/haproxy-dev/haproxy.inc
index 275ea8ab..12920103 100644
--- a/config/haproxy-dev/haproxy.inc
+++ b/config/haproxy-dev/haproxy.inc
@@ -293,18 +293,18 @@ function haproxy_configure() {
$a_bind[$bname]['extaddr'] = $backend['extaddr'];
$a_bind[$bname]['port'] = $backend['port'];
}
- $bind = &$a_bind[$bname];
+ $b = &$a_bind[$bname];
// Overwrite ?
- $bind['type'] = $backend['type'];
- $bind['forwardfor'] = $backend['forwardfor'];
- $bind['httpclose'] = $backend['httpclose'];
- $bind['max_connections'] = $backend['max_connections'];
- $bind['client_timeout'] = $backend['client_timeout'];
- $bind['advanced'] = $backend['advanced'];
+ $b['type'] = $backend['type'];
+ $b['forwardfor'] = $backend['forwardfor'];
+ $b['httpclose'] = $backend['httpclose'];
+ $b['max_connections'] = $backend['max_connections'];
+ $b['client_timeout'] = $backend['client_timeout'];
+ $b['advanced'] = $backend['advanced'];
// pointer to each backend
- $bind['config'][] = $backend;
+ $b['config'][] = $backend;
}
}