www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCompression): Fail if

Browse Source 
enabled *and* if OpenSSL does not make any compression methods
  available.  Tweak wording for failure without SSL_OP_NO_COMPRESSION.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1556473 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2014-01-08 09:39:44 +00:00
parent 02780d57bd
commit 7f2edaa14e
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/ssl/ssl_engine_config.c
View File

@@ -699,9 +699,20 @@ const char *ssl_cmd_SSLCompression(cmd_parms *cmd, void *dcfg, int flag)
#ifndef SSL_OP_NO_COMPRESSION
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err)
return "This version of openssl does not support configuring "
"compression within <VirtualHost> sections.";
return "This version of OpenSSL does not support enabling "
"SSLCompression within <VirtualHost> sections.";
#endif
if (flag) {
/* Some (packaged) versions of OpenSSL do not support
* compression by default. Enabling this directive would not
* have the desired effect, so fail with an error. */
STACK_OF(SSL_COMP) *meths = SSL_COMP_get_compression_methods();
if (sk_SSL_COMP_num(meths) == 0) {
return "This version of OpenSSL does not have any compression methods "
"available, cannot enable SSLCompression.";
}
}
sc->compression = flag ? TRUE : FALSE;
return NULL;
#else