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

ylavic · ylavic · commit eaa0fb92d9c0 · 2024-03-27T09:26:41.000Z
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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -861,10 +861,12 @@ const char ssl_cmd_SSLCompression(cmd_parms cmd, void *dcfg, int flag)`
`861`	`861`	`}`
`862`	`862`	`}`
`863`	`863`	`sc->compression = flag ? TRUE : FALSE;`
`864`		`- return NULL;`
`865`	`864`	`#else`
`866`		`- return "Setting Compression mode unsupported; not implemented by the SSL library";`
	`865`	`+ if (flag) {`
	`866`	`+ return "Setting Compression mode unsupported; not implemented by the SSL library";`
	`867`	`+ }`
`867`	`868`	`#endif`
	`869`	`+ return NULL;`
`868`	`870`	`}`
`869`	`871`
`870`	`872`	`const char ssl_cmd_SSLHonorCipherOrder(cmd_parms cmd, void *dcfg, int flag)`