]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
mod_ssl: Allow for "SSLCompression off" still when OPENSSL_NO_COMP.
authorYann Ylavic <ylavic@apache.org>
Wed, 27 Mar 2024 09:26:41 +0000 (09:26 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 27 Mar 2024 09:26:41 +0000 (09:26 +0000)
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

modules/ssl/ssl_engine_config.c

index 406402d777ce2917d1227b65b5db0edbdfdc77bf..9af6f70fd0361a7a38579c8bab22177de83036dd 100644 (file)
@@ -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)