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

ylavic · ylavic · commit 65087e1f4464 · 2024-03-26T17:00:09.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". git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916561 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
@@ -951,10 +951,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
`@@ -951,10 +951,12 @@ const char ssl_cmd_SSLCompression(cmd_parms cmd, void *dcfg, int flag)`
`951`	`951`	`}`
`952`	`952`	`}`
`953`	`953`	`sc->compression = flag ? TRUE : FALSE;`
`954`		`- return NULL;`
`955`	`954`	`#else`
`956`		`- return "Setting Compression mode unsupported; not implemented by the SSL library";`
	`955`	`+ if (flag) {`
	`956`	`+ return "Setting Compression mode unsupported; not implemented by the SSL library";`
	`957`	`+ }`
`957`	`958`	`#endif`
	`959`	`+ return NULL;`
`958`	`960`	`}`
`959`	`961`
`960`	`962`	`const char ssl_cmd_SSLHonorCipherOrder(cmd_parms cmd, void *dcfg, int flag)`