From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 27 Mar 2024 09:26:41 +0000 (+0000)
Subject: mod_ssl: Allow for "SSLCompression off" still when OPENSSL_NO_COMP.
X-Git-Tag: 2.4.59-rc1-candidate~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa0fb92d9c05dbd63fba9705c6c25b680a3da68;p=thirdparty%2Fapache%2Fhttpd.git

mod_ssl: Allow for "SSLCompression off" still when OPENSSL_NO_COMP.

Latest OpenSSL versions have OPENSSL_NO_COMP by default, avoid breaking
existing "SSLCompression off" in configurations since it's a noop.

* modules/ssl/ssl_engine_config.c(ssl_cmd_SSLCompression):
  Don't fail for OPENSSL_NO_COMP if the flag is "off".


Merges r1916561 from ^/httpd/httpd/trunk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916575 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 406402d777c..9af6f70fd03 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -861,10 +861,12 @@ const char *ssl_cmd_SSLCompression(cmd_parms *cmd, void *dcfg, int flag)
         }
     }
     sc->compression = flag ? TRUE : FALSE;
-    return NULL;
 #else
-    return "Setting Compression mode unsupported; not implemented by the SSL library";
+    if (flag) {
+        return "Setting Compression mode unsupported; not implemented by the SSL library";
+    }
 #endif
+    return NULL;
 }
 
 const char *ssl_cmd_SSLHonorCipherOrder(cmd_parms *cmd, void *dcfg, int flag)