aboutsummaryrefslogtreecommitdiffstats
path: root/config/haproxy/haproxy.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-12-28 16:19:33 -0500
committerScott Ullrich <sullrich@pfsense.org>2009-12-28 16:19:33 -0500
commitb00b3a9deeaf9ad23a3e4c14e35457e53a5502e0 (patch)
treea0abd8ab2843aa8066df61656d0fac164d1dce53 /config/haproxy/haproxy.inc
parent8abb2ca8d259e9afa3514ab4694686fc3d668ad4 (diff)
downloadpfsense-packages-b00b3a9deeaf9ad23a3e4c14e35457e53a5502e0.tar.gz
pfsense-packages-b00b3a9deeaf9ad23a3e4c14e35457e53a5502e0.tar.bz2
pfsense-packages-b00b3a9deeaf9ad23a3e4c14e35457e53a5502e0.zip
Turn c/r into spaces for multiple options per line
Diffstat (limited to 'config/haproxy/haproxy.inc')
-rw-r--r--config/haproxy/haproxy.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index 61909e90..35f8ecac 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" . $a_global['advanced'] . "\n");
+ fwrite ($fd, "\t" . str_replace("\n", " ", $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']}\n");
@@ -153,7 +153,7 @@ function haproxy_configure() {
// Advanced pass trhu
if($backend['advanced'])
- fwrite ($fd, "\t{$backend['advanced']}\n");
+ fwrite ($fd, "\t" . str_replace("\n", " ", $backend['advanced']) . "\n");
// https is an alias for tcp for clarity purpouses
if(strtolower($backend['type']) == "https") {
@@ -234,7 +234,7 @@ function haproxy_configure() {
$server_ports[] = $server['port'];
}
if($server['advanced'])
- $advanced_txt = " " . $server['advanced'];
+ $advanced_txt = " " . str_replace("\n", " ", $server['advanced']);
else
$advanced_txt = "";
foreach($server_ports as $pport)