aboutsummaryrefslogtreecommitdiffstats
path: root/config/haproxy
diff options
context:
space:
mode:
authorserg dvoriancev <dv_serg@mail.ru>2010-04-12 21:52:00 +0400
committerserg dvoriancev <dv_serg@mail.ru>2010-04-12 21:52:00 +0400
commit312f6a4827d742869daba0ebb186b6de5483379a (patch)
tree9285758224d8a53d519f7fab142629397e1ef13d /config/haproxy
parent8d8c3e1278c35aaf235710d07cbe6583337700d5 (diff)
parente8fa9505ad3c402bf4a5b5143842c0028382a658 (diff)
downloadpfsense-packages-312f6a4827d742869daba0ebb186b6de5483379a.tar.gz
pfsense-packages-312f6a4827d742869daba0ebb186b6de5483379a.tar.bz2
pfsense-packages-312f6a4827d742869daba0ebb186b6de5483379a.zip
Merge branch 'master' of http://gitweb.pfsense.org/pfsense-packages/mainline
Diffstat (limited to 'config/haproxy')
-rw-r--r--config/haproxy/haproxy.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index 536ef1f7..a94c84fd 100644
--- a/config/haproxy/haproxy.inc
+++ b/config/haproxy/haproxy.inc
@@ -109,7 +109,7 @@ function haproxy_configure() {
if(is_array($a_global)) {
fwrite ($fd, "global\n");
if($a_global['advanced'])
- fwrite ($fd, "\t" . base64deode($a_global['advanced']) . "\n");
+ fwrite ($fd, "\t" . base64_decode($a_global['advanced']) . "\n");
fwrite ($fd, "\tmaxconn\t\t\t".$a_global['maxconn']."\n");
if($a_global['remotesyslog'])
fwrite ($fd, "\tlog\t\t\t{$a_global['remotesyslog']}\tlocal0\n");
@@ -417,4 +417,4 @@ function haproxy_do_xmlrpc_sync($sync_to_ip, $password) {
}
}
-?> \ No newline at end of file
+?>