Merge branch '2.1' into 2.2

BUILD/install_build_deps.sh

@@ -66,6 +66,9 @@ else
          sqlite sqlite-devel pkgconfig lua lua-devel rpm-build createrepo yum-utils \
          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"
     if [ $? == 0 ]
     then

BUILD/mdbci/build.sh

@@ -52,6 +52,12 @@ if [ "${try_already_running}" == "yes" ]; then
 fi
 
 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
 $(<${script_dir}/templates/build.json.template)
@@ -64,11 +70,6 @@ $(<${script_dir}/templates/build.json.template)
 	touch ~/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
 	echo "Generating build VM template"
 	${mdbci_dir}/mdbci --override --template $MDBCI_VM_PATH/$name.json generate $name
@@ -104,14 +105,11 @@ if [ $? -eq 0 ] ; then
 #        exit 1
 fi
 
-
 ${script_dir}/create_remote_repo.sh
-
 ${script_dir}/copy_repos.sh
 
-
 echo "Removing locks and destroying VM"
-cd $MDBCI_VM_PATH/$name
+
 if [ "$try_already_running" == "yes" ] ; then
   echo "Release lock for already running VM"
   rm $snapshot_lock_file

server/core/listener.cc

@@ -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)
         {