From 5cebd66920b47f1564d84c1ce0eb088d44b472b6 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 16 Sep 2018 08:46:59 +0200
Subject: [PATCH] net/haproxy: update to 2.9

---
 net/haproxy/Makefile                                   |  2 +-
 .../OPNsense/HAProxy/forms/dialogBackend.xml           |  7 +++++++
 .../mvc/app/models/OPNsense/HAProxy/HAProxy.xml        | 10 ++++++++++
 .../service/templates/OPNsense/HAProxy/haproxy.conf    |  3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 4f56b36c0..653211941 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		haproxy
-PLUGIN_VERSION=		2.8
+PLUGIN_VERSION=		2.9
 PLUGIN_COMMENT=		Reliable, high performance TCP/HTTP load balancer
 PLUGIN_DEPENDS=		haproxy
 PLUGIN_MAINTAINER=	opnsense@moov.de
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
index 0017749f3..bfb59e8e9 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
@@ -275,6 +275,13 @@
         <help><![CDATA[Don't use port on server, use the same port as frontend receive. If check enable, require port check in server.]]></help>
         <advanced>true</advanced>
     </field>
+    <field>
+        <id>backend.tuning_httpreuse</id>
+        <label>HTTP reuse</label>
+        <type>dropdown</type>
+        <help><![CDATA[Declare how idle HTTP connections may be shared between requests.]]></help>
+        <advanced>true</advanced>
+    </field>
     <field>
         <label>Rules</label>
         <type>header</type>
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
index a060c2e9b..566a97e6c 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -838,6 +838,16 @@
                     <default>0</default>
                     <Required>Y</Required>
                 </tuning_noport>
+                <tuning_httpreuse type="OptionField">
+                    <Required>N</Required>
+                    <default>never</default>
+                    <OptionValues>
+                        <never>Never [default]</never>
+                        <safe>Safe</safe>
+                        <aggressive>Aggressive</aggressive>
+                        <always>Always</always>
+                    </OptionValues>
+                </tuning_httpreuse>
                 <linkedActions type="ModelRelationField">
                     <Model>
                         <template>
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
index b1452d789..5ed67d2c2 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -1032,6 +1032,9 @@ backend {{backend.name}}
     {{customOpt}}
 {%         endfor %}
 {%       endif %}
+{%       if backend.tuning_httpreuse|default("") != "" and backend.mode == "http" %}
+    http-reuse {{backend.tuning_httpreuse}}
+{%       endif %}
 {%       if backend.tuning_defaultserver|default("") != "" %}
     default-server {{backend.tuning_defaultserver}}
 {%       endif %}