From 5037167ac90584c0a6f565472c2b7e33ba4b2aef Mon Sep 17 00:00:00 2001
From: andrewheberle <andrewheberle@users.noreply.github.com>
Date: Wed, 11 Sep 2019 05:57:23 +0800
Subject: [PATCH] Add v2.0 "max-object-size" option (#1458)

---
 .../mvc/app/controllers/OPNsense/HAProxy/forms/main.xml     | 6 ++++++
 .../opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml    | 6 ++++++
 .../service/templates/OPNsense/HAProxy/haproxy.conf         | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml
index 8d0e5ad79..15e2cbc43 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml
@@ -337,6 +337,12 @@
                 <type>text</type>
                 <help><![CDATA[Define the maximum expiration duration. Cache-Control response headers will be respected if they are less than this value. The default value is 60 seconds.]]></help>
             </field>
+            <field>
+                <id>haproxy.general.cache.maxObjectSize</id>
+                <label>Maximum Object Size (bytes)</label>
+                <type>text</type>
+                <help><![CDATA[Define the maximum size of the objects to be cached. Must not be greater than an half of the maximum size of the cache. If not set, it equals to a 256th of the cache size. All objects with sizes larger than this value will not be cached.]]></help>
+            </field>
         </subtab>
     </tab>
 </form>
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 d35587876..07693824e 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
@@ -343,6 +343,12 @@
                     <Required>N</Required>
                     <ValidationMessage>Please specify a value between 1 and 3600.</ValidationMessage>
                 </maxAge>
+                <maxObjectSize type="IntegerField">
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>2146435072</MaximumValue>
+                    <Required>N</Required>
+                    <ValidationMessage>Please specify a value between 1 and 2146435072.</ValidationMessage>
+                </maxObjectSize>
             </cache>
         </general>
         <frontends>
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 c606f3a6c..0bd3cef3e 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -884,6 +884,9 @@ cache opnsense-haproxy-cache
 {%   if OPNsense.HAProxy.general.cache.maxAge|default("") != "" %}
     max-age {{OPNsense.HAProxy.general.cache.maxAge}}
 {%   endif %}
+{%   if OPNsense.HAProxy.general.cache.maxObjectSize|default("") != "" %}
+    max-object-size {{OPNsense.HAProxy.general.cache.maxObjectSize}}
+{%   endif %}
 {%- endif -%}
 
 {# ############################### #}