commit f5f430df56871bc937950274b2c86681d3db6e59
author James E. King III <jking@apache.org> Fri Jun 08 03:37:55 2018 +0000
committer James E. King III <jking@apache.org> Sat Jun 16 19:16:04 2018 +0000
tree a9f6f1258ea16a51915dd18799af3230d36d1630
parent b5471f63cb4bb8e3b00835a9ca9e48ff76a3bb51

THRIFT-4579: Move up to Ubuntu Bionic for CI builds
make dlang library compatible with openssl-1.1 for Ubuntu Bionic
Requires an upstream deimos update to be compatible.

test/cpp/src/TestClient.cpp

diff --git a/test/cpp/src/TestClient.cpp b/test/cpp/src/TestClient.cpp
index 9544a4a..87bb028 100644
--- a/test/cpp/src/TestClient.cpp
+++ b/test/cpp/src/TestClient.cpp
@@ -946,7 +946,7 @@
         failed = true;
       } else {
         map<Numberz::type, Insanity>::const_iterator it26 = it2->second.find(Numberz::SIX);
-        if (it26 == it1->second.end() || it26->second != Insanity()) {
+        if (it26 == it2->second.end() || it26->second != Insanity()) {
           failed = true;
         }
       }

test/features/nosslv3.sh

diff --git a/test/features/nosslv3.sh b/test/features/nosslv3.sh
index e550d51..38cca07 100755
--- a/test/features/nosslv3.sh
+++ b/test/features/nosslv3.sh
@@ -32,6 +32,13 @@
 {
   local nego
   local negodenied
+  local opensslv
+
+  opensslv=$(openssl version | cut -d' ' -f2)
+  if [[ $opensslv > "1.0" ]]; then
+    echo "[pass] OpenSSL 1.1 or later - no need to check ssl3"
+    return 0
+  fi
 
   # echo "openssl s_client -connect $THRIFTHOST:$THRIFTPORT -CAfile ../keys/CA.pem -ssl3 2>&1 < /dev/null"
   nego=$(openssl s_client -connect $THRIFTHOST:$THRIFTPORT -CAfile ../keys/CA.pem -ssl3 2>&1 < /dev/null)