From 214103b7e8fb87584cb2feaba6186c2abd89407b Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Fri, 7 Nov 2014 11:41:10 +0900
Subject: [PATCH] Renamed ServerSslAuthConfiguration class to
 ServerSslConfiguration class

---
 websocket-sharp/Ext.cs                             |  2 +-
 websocket-sharp/Net/EndPointListener.cs            | 10 +++++-----
 websocket-sharp/Net/HttpListener.cs                | 10 +++++-----
 ...hConfiguration.cs => ServerSslConfiguration.cs} | 14 +++++++-------
 .../Net/WebSockets/TcpListenerWebSocketContext.cs  |  2 +-
 websocket-sharp/Server/HttpServer.cs               |  6 +++---
 websocket-sharp/Server/WebSocketServer.cs          | 10 +++++-----
 websocket-sharp/websocket-sharp.csproj             |  2 +-
 8 files changed, 28 insertions(+), 28 deletions(-)
 rename websocket-sharp/Net/{ServerSslAuthConfiguration.cs => ServerSslConfiguration.cs} (93%)

diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs
index abeabcc5..059cbb32 100644
--- a/websocket-sharp/Ext.cs
+++ b/websocket-sharp/Ext.cs
@@ -561,7 +561,7 @@ namespace WebSocketSharp
       this TcpClient tcpClient,
       string protocol,
       bool secure,
-      ServerSslAuthConfiguration sslConfig,
+      ServerSslConfiguration sslConfig,
       Logger logger)
     {
       return new TcpListenerWebSocketContext (tcpClient, protocol, secure, sslConfig, logger);
diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs
index 04b67eb5..dc9d4810 100644
--- a/websocket-sharp/Net/EndPointListener.cs
+++ b/websocket-sharp/Net/EndPointListener.cs
@@ -66,7 +66,7 @@ namespace WebSocketSharp.Net
     private Dictionary<HttpListenerPrefix, HttpListener> _prefixes;
     private bool                                         _secure;
     private Socket                                       _socket;
-    private ServerSslAuthConfiguration                   _sslConfig;
+    private ServerSslConfiguration                       _sslConfig;
     private List<HttpListenerPrefix>                     _unhandled; // host == '*'
     private Dictionary<HttpConnection, HttpConnection>   _unregistered;
     private object                                       _unregisteredSync;
@@ -90,16 +90,16 @@ namespace WebSocketSharp.Net
       int port,
       bool secure,
       string certificateFolderPath,
-      ServerSslAuthConfiguration sslConfiguration,
+      ServerSslConfiguration sslConfig,
       bool reuseAddress)
     {
       if (secure) {
-        var cert = getCertificate (port, certificateFolderPath, sslConfiguration.ServerCertificate);
+        var cert = getCertificate (port, certificateFolderPath, sslConfig.ServerCertificate);
         if (cert == null)
           throw new ArgumentException ("No server certificate could be found.");
 
         _secure = secure;
-        _sslConfig = sslConfiguration;
+        _sslConfig = sslConfig;
         _sslConfig.ServerCertificate = cert;
       }
 
@@ -132,7 +132,7 @@ namespace WebSocketSharp.Net
       }
     }
 
-    public ServerSslAuthConfiguration SslConfiguration {
+    public ServerSslConfiguration SslConfiguration {
       get {
         return _sslConfig;
       }
diff --git a/websocket-sharp/Net/HttpListener.cs b/websocket-sharp/Net/HttpListener.cs
index 4a2aa6de..ea9cbee5 100644
--- a/websocket-sharp/Net/HttpListener.cs
+++ b/websocket-sharp/Net/HttpListener.cs
@@ -77,7 +77,7 @@ namespace WebSocketSharp.Net
     private HttpListenerPrefixCollection                         _prefixes;
     private string                                               _realm;
     private bool                                                 _reuseAddress;
-    private ServerSslAuthConfiguration                           _sslConfig;
+    private ServerSslConfiguration                               _sslConfig;
     private List<ListenerAsyncResult>                            _waitQueue;
     private object                                               _waitQueueSync;
 
@@ -311,16 +311,16 @@ namespace WebSocketSharp.Net
     /// optionally the client for secure connection.
     /// </summary>
     /// <value>
-    /// A <see cref="ServerSslAuthConfiguration"/> that represents the configuration
-    /// used to authenticate the server and optionally the client for secure connection.
+    /// A <see cref="ServerSslConfiguration"/> that represents the configuration used
+    /// to authenticate the server and optionally the client for secure connection.
     /// </value>
     /// <exception cref="ObjectDisposedException">
     /// This listener has been closed.
     /// </exception>
-    public ServerSslAuthConfiguration SslConfiguration {
+    public ServerSslConfiguration SslConfiguration {
       get {
         CheckDisposed ();
-        return _sslConfig ?? (_sslConfig = new ServerSslAuthConfiguration (null));
+        return _sslConfig ?? (_sslConfig = new ServerSslConfiguration (null));
       }
 
       set {
diff --git a/websocket-sharp/Net/ServerSslAuthConfiguration.cs b/websocket-sharp/Net/ServerSslConfiguration.cs
similarity index 93%
rename from websocket-sharp/Net/ServerSslAuthConfiguration.cs
rename to websocket-sharp/Net/ServerSslConfiguration.cs
index 2e655090..f0dbb3de 100644
--- a/websocket-sharp/Net/ServerSslAuthConfiguration.cs
+++ b/websocket-sharp/Net/ServerSslConfiguration.cs
@@ -1,6 +1,6 @@
 #region License
 /*
- * ServerSslAuthConfiguration.cs
+ * ServerSslConfiguration.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 server.
   /// </summary>
-  public class ServerSslAuthConfiguration
+  public class ServerSslConfiguration
   {
     #region Private Fields
 
@@ -58,20 +58,20 @@ namespace WebSocketSharp.Net
     #region Public Constructors
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="ServerSslAuthConfiguration"/> class with
+    /// Initializes a new instance of the <see cref="ServerSslConfiguration"/> class with
     /// the specified <paramref name="serverCertificate"/>.
     /// </summary>
     /// <param name="serverCertificate">
     /// A <see cref="X509Certificate2"/> that represents the certificate used to authenticate
     /// the server.
     /// </param>
-    public ServerSslAuthConfiguration (X509Certificate2 serverCertificate)
+    public ServerSslConfiguration (X509Certificate2 serverCertificate)
       : this (serverCertificate, false, SslProtocols.Default, false)
     {
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="ServerSslAuthConfiguration"/> class with
+    /// Initializes a new instance of the <see cref="ServerSslConfiguration"/> class with
     /// the specified <paramref name="serverCertificate"/>,
     /// <paramref name="clientCertificateRequired"/>, <paramref name="enabledSslProtocols"/>,
     /// and <paramref name="checkCertificateRevocation"/>.
@@ -92,7 +92,7 @@ namespace WebSocketSharp.Net
     /// <c>true</c> if the certificate revocation list is checked during authentication;
     /// otherwise, <c>false</c>.
     /// </param>
-    public ServerSslAuthConfiguration (
+    public ServerSslConfiguration (
       X509Certificate2 serverCertificate,
       bool clientCertificateRequired,
       SslProtocols enabledSslProtocols,
@@ -183,7 +183,7 @@ namespace WebSocketSharp.Net
     }
 
     /// <summary>
-    /// Gets or sets the certificate used to authenticate the server on the secure connection.
+    /// Gets or sets the certificate used to authenticate the server for secure connection.
     /// </summary>
     /// <value>
     /// A <see cref="X509Certificate2"/> that represents the certificate used to authenticate
diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
index b6192aa2..c71c3a6a 100644
--- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
@@ -71,7 +71,7 @@ namespace WebSocketSharp.Net.WebSockets
       TcpClient tcpClient,
       string protocol,
       bool secure,
-      ServerSslAuthConfiguration sslConfig,
+      ServerSslConfiguration sslConfig,
       Logger logger)
     {
       _tcpClient = tcpClient;
diff --git a/websocket-sharp/Server/HttpServer.cs b/websocket-sharp/Server/HttpServer.cs
index bcef5850..09e15e2c 100644
--- a/websocket-sharp/Server/HttpServer.cs
+++ b/websocket-sharp/Server/HttpServer.cs
@@ -339,10 +339,10 @@ namespace WebSocketSharp.Server
     /// optionally the client for secure connection.
     /// </summary>
     /// <value>
-    /// A <see cref="ServerSslAuthConfiguration"/> that represents the configuration
-    /// used to authenticate the server and optionally the client for secure connection.
+    /// A <see cref="ServerSslConfiguration"/> that represents the configuration used
+    /// to authenticate the server and optionally the client for secure connection.
     /// </value>
-    public ServerSslAuthConfiguration SslConfiguration {
+    public ServerSslConfiguration SslConfiguration {
       get {
         return _listener.SslConfiguration;
       }
diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs
index d436d91f..71e52b8b 100644
--- a/websocket-sharp/Server/WebSocketServer.cs
+++ b/websocket-sharp/Server/WebSocketServer.cs
@@ -70,7 +70,7 @@ namespace WebSocketSharp.Server
     private bool                               _reuseAddress;
     private bool                               _secure;
     private WebSocketServiceManager            _services;
-    private ServerSslAuthConfiguration         _sslConfig;
+    private ServerSslConfiguration             _sslConfig;
     private volatile ServerState               _state;
     private object                             _sync;
     private Uri                                _uri;
@@ -445,12 +445,12 @@ namespace WebSocketSharp.Server
     /// optionally the client for secure connection.
     /// </summary>
     /// <value>
-    /// A <see cref="ServerSslAuthConfiguration"/> that represents the configuration
-    /// used to authenticate the server and optionally the client for secure connection.
+    /// A <see cref="ServerSslConfiguration"/> that represents the configuration used
+    /// to authenticate the server and optionally the client for secure connection.
     /// </value>
-    public ServerSslAuthConfiguration SslConfiguration {
+    public ServerSslConfiguration SslConfiguration {
       get {
-        return _sslConfig ?? (_sslConfig = new ServerSslAuthConfiguration (null));
+        return _sslConfig ?? (_sslConfig = new ServerSslConfiguration (null));
       }
 
       set {
diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj
index b70705ff..620786c5 100644
--- a/websocket-sharp/websocket-sharp.csproj
+++ b/websocket-sharp/websocket-sharp.csproj
@@ -67,7 +67,6 @@
     <Compile Include="CloseEventArgs.cs" />
     <Compile Include="ByteOrder.cs" />
     <Compile Include="ErrorEventArgs.cs" />
-    <Compile Include="Net\ServerSslAuthConfiguration.cs" />
     <Compile Include="WebSocket.cs" />
     <Compile Include="Server\WebSocketServer.cs" />
     <Compile Include="Net\AuthenticationSchemes.cs" />
@@ -136,6 +135,7 @@
     <Compile Include="Server\WebSocketBehavior.cs" />
     <Compile Include="Net\HttpListenerPrefix.cs" />
     <Compile Include="Net\ClientSslConfiguration.cs" />
+    <Compile Include="Net\ServerSslConfiguration.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>