Merge remote branch 'upstream/dev' into major

* upstream/dev:
  Both the SSLv3 and TLS 1.0/TLS 1.1 specifications require implementations to ignore data following the ClientHello (i.e., extensions) if they do not understand them.
  fix unknown ssl extension parsing by changing length from bits to bytes
  Temporary disable tests on MAC due to issus with the MAC ODBC drivers

1 files changed, 18 insertions, 11 deletions

diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl
index 4d7d1ae2fa..a8439d5fb6 100644
--- a/lib/odbc/test/odbc_test_lib.erl
+++ b/lib/odbc/test/odbc_test_lib.erl
@@ -36,18 +36,25 @@ match_float(Float, Match, Delta) ->
     (Float < Match + Delta) and (Float > Match - Delta).
 
 odbc_check() ->
-    case erlang:system_info({wordsize, external}) of
-	4 ->
-	    ok;
-	Other ->
-	    case os:type() of
-		{unix, linux} ->
+    case os:type() of
+	{unix,darwin} ->
+	    lists:flatten(
+	      io_lib:format("Currently we have no working drivers for MAC",
+			    []));
+	_ ->
+	    case erlang:system_info({wordsize, external}) of
+		4 ->
 		    ok;
-		Platform ->
-		    lists:flatten(
-		      io_lib:format("Word on platform ~w size"
-				    " ~w not supported", [Other,
-							  Platform]))
+		Other ->
+		    case os:type() of
+			{unix, linux} ->
+			    ok;
+			Platform ->
+			    lists:flatten(
+			      io_lib:format("Word on platform ~w size"
+					    " ~w not supported", [Other,
+								  Platform]))
+		    end
 	    end
     end.