Merge branch '6.8' into 6.8-release

Author: Roberto Garcia

CHANGES

@@ -2,6 +2,9 @@
 - Fix for Nested transactions are not supported in Entity Framework (MySQL Bug #71502, Oracle Bug #22366266).
 - Fix for EF5 and EF6 wrong SQL statement to set primary key (MySQL Bug 76292, Oracle Bug #20711384) 
 - Fixed problem where mysql.proc tables would not be used for metadata even though access was available (MySQL Bug #74116, Oracle Bug #20960373)
+- Added support for TLSv1.1 and TLSv1.2
+- Fixed Fix for "Aborted connection" (MySQL Bug #80997, Oracle Bug # 23346197).
+
 
 6.8.7
 - Changed handshake process to use bytes instead of encoded strings.

Source/MySql.Data/Driver.cs

@@ -1,4 +1,4 @@
-// Copyright © 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2004, 2016, Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -58,7 +58,7 @@ internal class Driver : IDisposable
  private bool firstResult;
  protected IDriver handler;
  internal MySqlDataReader reader;
- private bool disposeInProgress;
+ private bool disposed;
 
  /// <summary>
  /// For pooled connections, time when the driver was
@@ -532,20 +532,16 @@ public virtual void CloseQuery(MySqlConnection connection, int statementId)
  protected virtual void Dispose(bool disposing)
  {
  // Avoid cyclic calls to Dispose.
- if (disposeInProgress)
+ if (disposed)
  return;
-
- disposeInProgress = true;
-
  try
  {
- ResetTimeout(1000);
- if (disposing)
- handler.Close(isOpen);
+ ResetTimeout(1000); 
+ handler.Close(isOpen); 
  // if we are pooling, then release ourselves
  if (connectionString.Pooling)
-  MySqlPoolManager.RemoveConnection(this);
-  }
+ MySqlPoolManager.RemoveConnection(this); 
+ }
  catch (Exception)
  {
  if (disposing)
@@ -555,7 +551,7 @@ protected virtual void Dispose(bool disposing)
  {
  reader = null;
  isOpen = false;
- disposeInProgress = false;
+ disposed = true;
  }
  }
 

Source/MySql.Data/NativeDriver.cs

@@ -60,6 +60,7 @@ internal class NativeDriver : IDriver
  private Driver owner;
  private int warnings;
  private MySqlAuthenticationPlugin authPlugin;
+ private bool isEnterprise;
 
  // Windows authentication method string, used by the protocol.
  // Also known as "client plugin name".
@@ -222,6 +223,7 @@ public void Open()
  packet = stream.ReadPacket();
  int protocol = packet.ReadByte();
  string versionString = packet.ReadString();
+ isEnterprise = versionString.ToLowerInvariant().Contains("-enterprise-");
  version = DBVersion.Parse(versionString);
  if (!version.isAtLeast(5, 0, 0))
  throw new NotSupportedException(Resources.ServerTooOld);
@@ -379,11 +381,16 @@ private void StartSSL()
  new RemoteCertificateValidationCallback(ServerCheckValidation);
  SslStream ss = new SslStream(baseStream, true, sslValidateCallback, null);
  X509CertificateCollection certs = GetClientCertificates();
- ss.AuthenticateAsClient(Settings.Server, certs, SslProtocols.Tls, false);
+ SslProtocols sslProtocols = SslProtocols.Tls;
+#if NET_45_OR_GREATER
+ sslProtocols |= SslProtocols.Tls11;
+ if (version.isAtLeast(5, 6, 0) && isEnterprise)
+ sslProtocols |= SslProtocols.Tls12;
+#endif
+ ss.AuthenticateAsClient(Settings.Server, certs, sslProtocols, false);
  baseStream = ss;
  stream = new MySqlStream(ss, Encoding, false);
  stream.SequenceByte = 2;
-
  }
 
  private bool ServerCheckValidation(object sender, X509Certificate certificate,
@@ -410,16 +417,16 @@ private bool ServerCheckValidation(object sender, X509Certificate certificate,
  }
 
 
- #endregion
+#endregion
 
 #endif
 
- #region Authentication
+  #region Authentication
 
- /// <summary>
- /// Return the appropriate set of connection flags for our
- /// server capabilities and our user requested options.
- /// </summary>
+  /// <summary>
+  /// Return the appropriate set of connection flags for our
+  /// server capabilities and our user requested options.
+  /// </summary>
  private void SetConnectionFlags(ClientFlags serverCaps)
  {
  // allow load data local infile

Source/MySql.Data/transaction.cs

@@ -89,10 +89,16 @@ public void Dispose()
  GC.SuppressFinalize(this);
  }
 
+#if RT
+ protected void Dispose(bool disposing)
+#else
  protected override void Dispose(bool disposing)
+#endif
  {
  if (disposed) return;
+#if !RT
  base.Dispose(disposing);
+#endif
  if (disposing)
  {
  if ((conn != null && conn.State == ConnectionState.Open || conn.SoftClosed) && open)

Tests/MySql.Data.Tests/MySqlConnectionTests.cs

@@ -1,4 +1,4 @@
-// Copyright © 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2013, 2016 Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -1341,7 +1341,7 @@ public void SslPreferredByDefault()
  using (MySqlDataReader reader = command.ExecuteReader())
  {
  Assert.True(reader.Read());
- Assert.Equal("TLSv1", reader.GetString(1));
+ Assert.True(reader.GetString(1).StartsWith("TLSv1"));
  }
  }
  }
@@ -1361,5 +1361,42 @@ public void SslOverrided()
  }
  }
  }
+
+
+
+ /// <summary>
+ /// Fix for aborted connections MySQL bug 80997 OraBug 23346197
+ /// </summary>
+ [Fact]
+ public void MarkConnectionAsClosedProperlyWhenDisposing()
+ {
+ MySqlConnection con = new MySqlConnection(st.GetConnectionString(true));
+ con.Open();
+ MySqlCommand cmd = new MySqlCommand() { Connection = con };
+ cmd.CommandText = "Flush status"; // reset values
+ cmd.ExecuteNonQuery();
+
+ AppDomain appDomain = FullTrustSandbox.CreateFullTrustDomain();
+ FullTrustSandbox sandbox = (FullTrustSandbox)appDomain.CreateInstanceAndUnwrap(
+ typeof(FullTrustSandbox).Assembly.FullName,
+ typeof(FullTrustSandbox).FullName);
+ try
+ {
+ MySqlConnection connection = sandbox.TryOpenConnection("server=localhost;userid=root;pwd=;port=3305");
+ Assert.NotNull(connection);
+ Assert.True(connection.State == ConnectionState.Open);
+ }
+ finally
+ {
+ AppDomain.Unload(appDomain);
+ }
+ cmd = new MySqlCommand("show global status like 'aborted_clients'", con); 
+ MySqlDataReader r = cmd.ExecuteReader();
+ r.Read();
+ int numClientsAborted = r.GetInt32(1);
+ r.Close(); 
+ Assert.Equal(0, numClientsAborted);
+ con.Close();
+ }
  }
 }