From 1a09e5de6badf2bfc7bef0e134aafd3d08532129 Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Thu, 30 Sep 2010 15:55:17 -0700
Subject: [PATCH] bug 6105: default to mode http if the public port is 80

---
 core/src/com/cloud/network/HAProxyConfigurator.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java
index fbd8476d7d4..1ff5b9f4596 100644
--- a/core/src/com/cloud/network/HAProxyConfigurator.java
+++ b/core/src/com/cloud/network/HAProxyConfigurator.java
@@ -117,6 +117,14 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
 		sb = new StringBuilder();
 		sb.append("\t").append("balance ").append(algorithm);
 		result.add(sb.toString());
+		if (publicPort.equals("80")) {
+			sb = new StringBuilder();
+			sb.append("\t").append("mode http");
+			result.add(sb.toString());
+			sb = new StringBuilder();
+			sb.append("\t").append("option httpclose");
+			result.add(sb.toString());
+		}
 		int i=0;
 		for (FirewallRuleVO rule: fwRules) {
 			//add line like this: "server  65_37_141_30-80_3 10.1.1.4:80 check"