http: disable lzma decompression from configuration

diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c
index 55f9a7a949f3d96276e9b2d4e98f7489892c3059..65a3591141cb8a92873bb593dc5bd81c082a391a 100644 (file)
--- a/src/app-layer-htp.c
+++ b/src/app-layer-htp.c
@@ -2702,6 +2702,12 @@ static void HTPConfigParseParameters(HTPCfgRec *cfg_prec, ConfNode *s,
             /* set default soft-limit with our new hard limit */
             SCLogConfig("Setting HTTP LZMA memory limit to %"PRIu32" bytes", limit);
             htp_config_set_lzma_memlimit(cfg_prec->cfg, (size_t)limit);
+#endif
+#ifdef HAVE_HTP_CONFIG_SET_LZMA_MEMLIMIT
+        } else if (strcasecmp("lzma-enabled", p->name) == 0) {
+            if (ConfValIsFalse(p->val)) {
+                htp_config_set_lzma_memlimit(cfg_prec->cfg, 0);
+            }
 #endif
         } else if (strcasecmp("randomize-inspection-sizes", p->name) == 0) {
             if (!g_disable_randomness) {

diff --git a/suricata.yaml.in b/suricata.yaml.in
index 5b75b426bba3f4ff7d56f8bb433097afdf32b6b0..9934761583abb0b9963f7f807505c4a02b3f6ca7 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -977,6 +977,7 @@ app-layer:
 
            # LZMA decompression memory limit.
            #lzma-memlimit: 1 Mb
+           #lzma-enabled: yes
 
          server-config: