Merge pull request #836 from andrewheberle/master

net/haproxy: add "http-reuse" option

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>

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>

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 %}