diff options
author | Glenn Strauss <gstrauss@gluelogic.com> | 2019-02-18 22:11:47 -0500 |
---|---|---|
committer | Glenn Strauss <gstrauss@gluelogic.com> | 2019-03-07 00:32:17 -0500 |
commit | 3e200717ccbc6aaed5f0da0610a2956af9d5d0e0 (patch) | |
tree | 4142c30c5d9c4564711abdffdd634bb0d7fbd412 | |
parent | 1542e44bb722cd33f8e32dbce4b208977f3420f3 (diff) | |
download | lighttpd-git-3e200717ccbc6aaed5f0da0610a2956af9d5d0e0.tar.gz |
[mod_openssl] inherit cipherlist from global scope
inherit cipherlist from global scope if not set in $SERVER["socket"]
-rw-r--r-- | src/mod_openssl.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/mod_openssl.c b/src/mod_openssl.c index 6954b122..74d0eb7e 100644 --- a/src/mod_openssl.c +++ b/src/mod_openssl.c @@ -1236,8 +1236,18 @@ SETDEFAULTS_FUNC(mod_openssl_set_defaults) s->ssl_read_ahead = (0 == i) ? 0 : p->config_storage[0]->ssl_read_ahead; - if (0 != i) buffer_copy_buffer(s->ssl_ca_crl_file, p->config_storage[0]->ssl_ca_crl_file); - if (0 != i) buffer_copy_buffer(s->ssl_ca_dn_file, p->config_storage[0]->ssl_ca_dn_file); + if (0 != i) { + buffer *b; + b = p->config_storage[0]->ssl_ca_crl_file; + if (!buffer_string_is_empty(b)) + buffer_copy_buffer(s->ssl_ca_crl_file, b); + b = p->config_storage[0]->ssl_ca_dn_file; + if (!buffer_string_is_empty(b)) + buffer_copy_buffer(s->ssl_ca_dn_file, b); + b = p->config_storage[0]->ssl_cipher_list; + if (!buffer_string_is_empty(b)) + buffer_copy_buffer(s->ssl_cipher_list, b); + } s->ssl_conf_cmd = (0 == i) ? array_init() : array_init_array(p->config_storage[0]->ssl_conf_cmd); |