[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    svn commit: r1916561 - /httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
From:       ylavic () apache ! org
Date:       2024-03-26 16:57:50
Message-ID: 20240326170010.13A6C17AFEC () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: ylavic
Date: Tue Mar 26 17:00:09 2024
New Revision: 1916561

URL: http://svn.apache.org/viewvc?rev=1916561&view=rev
Log:
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".


Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_config.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_config.c?rev=1916561&r1=1916560&r2=1916561&view=diff
 ==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Tue Mar 26 17:00:09 2024
@@ -951,10 +951,12 @@ const char *ssl_cmd_SSLCompression(cmd_p
         }
     }
     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)


[prev in list] [next in list] [prev in thread] [next in thread]