From c1d20ec7068f9928011d2860761eda4bb3bf4dbb Mon Sep 17 00:00:00 2001 From: sta Date: Thu, 6 Nov 2014 11:51:38 +0900 Subject: [PATCH] Renamed ClientSslAuthConfiguration class to ClientSslConfiguration class --- ...uthConfiguration.cs => ClientSslConfiguration.cs} | 12 ++++++------ websocket-sharp/WebSocket.cs | 11 +++++------ websocket-sharp/websocket-sharp.csproj | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) rename websocket-sharp/Net/{ClientSslAuthConfiguration.cs => ClientSslConfiguration.cs} (95%) diff --git a/websocket-sharp/Net/ClientSslAuthConfiguration.cs b/websocket-sharp/Net/ClientSslConfiguration.cs similarity index 95% rename from websocket-sharp/Net/ClientSslAuthConfiguration.cs rename to websocket-sharp/Net/ClientSslConfiguration.cs index 5e71bf88..82e71b04 100644 --- a/websocket-sharp/Net/ClientSslAuthConfiguration.cs +++ b/websocket-sharp/Net/ClientSslConfiguration.cs @@ -1,6 +1,6 @@ #region License /* - * ClientSslAuthConfiguration.cs + * ClientSslConfiguration.cs * * The MIT License * @@ -43,7 +43,7 @@ namespace WebSocketSharp.Net /// /// Stores the parameters used to configure a instance as a client. /// - public class ClientSslAuthConfiguration + public class ClientSslConfiguration { #region Private Fields @@ -59,20 +59,20 @@ namespace WebSocketSharp.Net #region Public Constructors /// - /// Initializes a new instance of the class with + /// Initializes a new instance of the class with /// the specified . /// /// /// A that represents the name of the server that shares /// a secure connection. /// - public ClientSslAuthConfiguration (string targetHost) + public ClientSslConfiguration (string targetHost) : this (targetHost, null, SslProtocols.Default, false) { } /// - /// Initializes a new instance of the class with + /// Initializes a new instance of the class with /// the specified , , /// , and . /// @@ -91,7 +91,7 @@ namespace WebSocketSharp.Net /// true if the certificate revocation list is checked during authentication; /// otherwise, false. /// - public ClientSslAuthConfiguration ( + public ClientSslConfiguration ( string targetHost, X509CertificateCollection clientCertificates, SslProtocols enabledSslProtocols, diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index b37cfe7f..ecdaf3ff 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -97,8 +97,7 @@ namespace WebSocketSharp private volatile WebSocketState _readyState; private AutoResetEvent _receivePong; private bool _secure; - private ClientSslAuthConfiguration - _sslConfig; + private ClientSslConfiguration _sslConfig; private Stream _stream; private TcpClient _tcpClient; private Uri _uri; @@ -431,14 +430,14 @@ namespace WebSocketSharp /// optionally the client for secure connection. /// /// - /// A that represents the configuration - /// used to authenticate the server and optionally the client for secure connection, + /// A that represents the configuration used + /// to authenticate the server and optionally the client for secure connection, /// or if the is used as server. /// - public ClientSslAuthConfiguration SslConfiguration { + public ClientSslConfiguration SslConfiguration { get { return _client - ? (_sslConfig ?? (_sslConfig = new ClientSslAuthConfiguration (_uri.DnsSafeHost))) + ? (_sslConfig ?? (_sslConfig = new ClientSslConfiguration (_uri.DnsSafeHost))) : null; } diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj index 04eef04d..b70705ff 100644 --- a/websocket-sharp/websocket-sharp.csproj +++ b/websocket-sharp/websocket-sharp.csproj @@ -1,4 +1,4 @@ - + Debug @@ -67,7 +67,6 @@ - @@ -136,6 +135,7 @@ +