hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-03-27 07:25:32 +03:00
parent a4a5641f5b 6e859fcf02
commit cbbfb1c5c0
8 changed files with 82 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/core/config.cc
View File

@ -492,8 +492,19 @@ static int ini_handler(void *userdata, const char *section, const char *name, co
if (is_empty_string(value))
{
MXS_ERROR("Empty value given to parameter '%s'", name);
return 0;
if (is_persisted_config)
{
/**
* Found old-style persisted configuration. These will be automatically
* upgraded on the next modification so we can safely ignore it.
*/
return 1;
}
else
{
MXS_ERROR("Empty value given to parameter '%s'", name);
return 0;
}
}
if (config_get_global_options()->substitute_variables)

3
server/core/listener.cc
View File

@ -319,6 +319,9 @@ listener_init_SSL(SSL_LISTENER *ssl_listener)
/** Disable SSLv3 */
SSL_CTX_set_options(ssl_listener->ctx, SSL_OP_NO_SSLv3);
// Disable session cache
SSL_CTX_set_session_cache_mode(ssl_listener->ctx, SSL_SESS_CACHE_OFF);
/** Generate the 512-bit and 1024-bit RSA keys */
if (rsa_512 == NULL && (rsa_512 = create_rsa(512)) == NULL)
{