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

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Markus Mäkelä
2018-03-27 07:25:00 +03:00
parent 801d7ccdc7 933a74a418
commit 6e859fcf02
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BUILD/install_build_deps.sh
View File

@ -66,6 +66,9 @@ else
sqlite sqlite-devel pkgconfig lua lua-devel rpm-build createrepo yum-utils \ sqlite sqlite-devel pkgconfig lua lua-devel rpm-build createrepo yum-utils \
gnutls-devel libgcrypt-devel pam-devel gnutls-devel libgcrypt-devel pam-devel
# Attempt to install libasan, it'll only work on CentOS 7
sudo yum install -y --nogpgcheck libasan
cat /etc/redhat-release | grep "release 5" cat /etc/redhat-release | grep "release 5"
if [ $? == 0 ] if [ $? == 0 ]
then then

16
BUILD/mdbci/build.sh
View File

@ -52,6 +52,12 @@ if [ "${try_already_running}" == "yes" ]; then
fi fi
if [ "$already_running" != "ok" ]; then if [ "$already_running" != "ok" ]; then
# destroying existing box
if [ -d "$MDBCI_VM_PATH/${name}" ]; then
${mdbci_dir}/mdbci destroy $name
fi
# Just in case some old lock file left
rm -rf ${snapshot_lock_file}
eval "cat <<EOF eval "cat <<EOF
$(<${script_dir}/templates/build.json.template) $(<${script_dir}/templates/build.json.template)
@ -64,11 +70,6 @@ $(<${script_dir}/templates/build.json.template)
touch ~/vagrant_lock touch ~/vagrant_lock
echo $JOB_NAME-$BUILD_NUMBER >> ~/vagrant_lock echo $JOB_NAME-$BUILD_NUMBER >> ~/vagrant_lock
# destroying existing box
if [ -d "$MDBCI_VM_PATH/${name}" ]; then
${mdbci_dir}/mdbci destroy $name
fi
# starting VM for build # starting VM for build
echo "Generating build VM template" echo "Generating build VM template"
${mdbci_dir}/mdbci --override --template $MDBCI_VM_PATH/$name.json generate $name ${mdbci_dir}/mdbci --override --template $MDBCI_VM_PATH/$name.json generate $name
@ -104,14 +105,11 @@ if [ $? -eq 0 ] ; then
# exit 1 # exit 1
fi fi
${script_dir}/create_remote_repo.sh ${script_dir}/create_remote_repo.sh
${script_dir}/copy_repos.sh ${script_dir}/copy_repos.sh
echo "Removing locks and destroying VM" echo "Removing locks and destroying VM"
cd $MDBCI_VM_PATH/$name
if [ "$try_already_running" == "yes" ] ; then if [ "$try_already_running" == "yes" ] ; then
echo "Release lock for already running VM" echo "Release lock for already running VM"
rm $snapshot_lock_file rm $snapshot_lock_file

3
server/core/listener.cc
View File

@ -319,6 +319,9 @@ listener_init_SSL(SSL_LISTENER *ssl_listener)
/** Disable SSLv3 */ /** Disable SSLv3 */
SSL_CTX_set_options(ssl_listener->ctx, SSL_OP_NO_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 */ /** Generate the 512-bit and 1024-bit RSA keys */
if (rsa_512 == NULL && (rsa_512 = create_rsa(512)) == NULL) if (rsa_512 == NULL && (rsa_512 = create_rsa(512)) == NULL)
{ {