DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed ClientSslAuthConfiguration class to ClientSslConfiguration class

Browse Source
This commit is contained in:
sta 2014-11-06 11:51:38 +09:00
parent e3e8fafaa6
commit c1d20ec706
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
websocket-sharp/Net/ClientSslAuthConfiguration.cs → websocket-sharp/Net/ClientSslConfiguration.cs
View File

@ -1,6 +1,6 @@
#region License
/*
* ClientSslAuthConfiguration.cs
* ClientSslConfiguration.cs
*
* The MIT License
*
@ -43,7 +43,7 @@ namespace WebSocketSharp.Net
/// <summary>
/// Stores the parameters used to configure a <see cref="SslStream"/> instance as a client.
/// </summary>
public class ClientSslAuthConfiguration
public class ClientSslConfiguration
{
#region Private Fields
@ -59,20 +59,20 @@ namespace WebSocketSharp.Net
#region Public Constructors
/// <summary>
/// Initializes a new instance of the <see cref="ClientSslAuthConfiguration"/> class with
/// Initializes a new instance of the <see cref="ClientSslConfiguration"/> class with
/// the specified <paramref name="targetHost"/>.
/// </summary>
/// <param name="targetHost">
/// A <see cref="string"/> that represents the name of the server that shares
/// a secure connection.
/// </param>
public ClientSslAuthConfiguration (string targetHost)
public ClientSslConfiguration (string targetHost)
: this (targetHost, null, SslProtocols.Default, false)
{
}
/// <summary>
/// Initializes a new instance of the <see cref="ClientSslAuthConfiguration"/> class with
/// Initializes a new instance of the <see cref="ClientSslConfiguration"/> class with
/// the specified <paramref name="targetHost"/>, <paramref name="clientCertificates"/>,
/// <paramref name="enabledSslProtocols"/>, and <paramref name="checkCertificateRevocation"/>.
/// </summary>
@ -91,7 +91,7 @@ namespace WebSocketSharp.Net
/// <c>true</c> if the certificate revocation list is checked during authentication;
/// otherwise, <c>false</c>.
/// </param>
public ClientSslAuthConfiguration (
public ClientSslConfiguration (
string targetHost,
X509CertificateCollection clientCertificates,
SslProtocols enabledSslProtocols,

11
websocket-sharp/WebSocket.cs
View File

@ -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.
/// </summary>
/// <value>
/// A <see cref="ClientSslAuthConfiguration"/> that represents the configuration
/// used to authenticate the server and optionally the client for secure connection,
/// A <see cref="ClientSslConfiguration"/> that represents the configuration used
/// to authenticate the server and optionally the client for secure connection,
/// or <see langword="null"/> if the <see cref="WebSocket"/> is used as server.
/// </value>
public ClientSslAuthConfiguration SslConfiguration {
public ClientSslConfiguration SslConfiguration {
get {
return _client
? (_sslConfig ?? (_sslConfig = new ClientSslAuthConfiguration (_uri.DnsSafeHost)))
? (_sslConfig ?? (_sslConfig = new ClientSslConfiguration (_uri.DnsSafeHost)))
: null;
}

4
websocket-sharp/websocket-sharp.csproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -67,7 +67,6 @@
<Compile Include="CloseEventArgs.cs" />
<Compile Include="ByteOrder.cs" />
<Compile Include="ErrorEventArgs.cs" />
<Compile Include="Net\ClientSslAuthConfiguration.cs" />
<Compile Include="Net\ServerSslAuthConfiguration.cs" />
<Compile Include="WebSocket.cs" />
<Compile Include="Server\WebSocketServer.cs" />
@ -136,6 +135,7 @@
<Compile Include="HttpResponse.cs" />
<Compile Include="Server\WebSocketBehavior.cs" />
<Compile Include="Net\HttpListenerPrefix.cs" />
<Compile Include="Net\ClientSslConfiguration.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>