From 7840cc8ce79668aa9e479ee0464474269ca04196 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Fri, 20 Nov 2009 18:06:22 -0500
Subject: Do not clobber backend variable.  Do not clobber listenip.  Vesoion
 bump for haproxy

---
 config/haproxy/haproxy.inc | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'config/haproxy')

diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index e5aabb38..f3203ab2 100644
--- a/config/haproxy/haproxy.inc
+++ b/config/haproxy/haproxy.inc
@@ -124,25 +124,28 @@ function haproxy_configure() {
 		foreach ($a_backends as $backend) {
 
 			// Define our backend name
-			$backend = "listen {$backend['name']}\n";
+			$backendinfo = "listen {$backend['name']}\n";
 
 			// Prepare ports for processing by splitting
-			$backend['port'] .= ",";
-			$ports = split(",", $backend['port']);
-
+			$portss = "{$backend['port']},";
+			$ports = split(",", $portss);
+			
+			// Initialize variable
+			$listenip = "";
+			
 			// Process and add bind directives for ports
 			foreach($ports as $port) {
 				if($port) {
 					if($backend['extaddr'] == "any") 
-						$listenip =  "bind\t\t\t0.0.0.0:" . $port . "\n";
+						$listenip .=  "\tbind\t\t\t0.0.0.0:{$port}\n";
 					elseif($backend['extaddr']) 
-						$listenip =  "bind\t\t\t" . $backend['extaddr'] . ":" . $port ."\n";				
+						$listenip .=  "\tbind\t\t\t{$backend['extaddr']}:{$port}\n";				
 					else 
-						$listenip = "bind\t\t\t" . get_current_wan_address('wan').":" . $port ."\n";
+						$listenip .= "\tbind\t\t\t" . get_current_wan_address('wan') . ":{$port}\n";
 				}
 			}
 			
-			fwrite ($fd, "{$backend}");
+			fwrite ($fd, "{$backendinfo}");
 			fwrite ($fd, "{$listenip}");
             fwrite ($fd, "\tmode\t\t\t".$backend['type'] . "\n");
 			fwrite ($fd, "\tlog\t\t\tglobal\n");
-- 
cgit v1.2.3