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

Fix for pull request #85, modified a few for WebSocketServer.SslConfiguration property

Browse Source
This commit is contained in:
sta 2014-11-01 12:26:32 +09:00
parent 689cc28532
commit 0de32bbacc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Example2/Program.cs
View File

@ -29,8 +29,8 @@ namespace Example2
#endif #endif
/* To provide the secure connection. /* To provide the secure connection.
var cert = ConfigurationManager.AppSettings["ServerCertFile"]; var cert = ConfigurationManager.AppSettings["ServerCertFile"];
var password = ConfigurationManager.AppSettings["CertFilePassword"]; var passwd = ConfigurationManager.AppSettings["CertFilePassword"];
wssv.Certificate = new X509Certificate2 (cert, password); wssv.SslConfiguration.ServerCertificate = new X509Certificate2 (cert, passwd);
*/ */
/* To provide the HTTP Authentication (Basic/Digest). /* To provide the HTTP Authentication (Basic/Digest).

8
websocket-sharp/Server/WebSocketServer.cs
View File

@ -442,15 +442,15 @@ namespace WebSocketSharp.Server
/// <summary> /// <summary>
/// Gets or sets the SSL configuration used to authenticate the server and optionally the client /// Gets or sets the SSL configuration used to authenticate the server and optionally the client
/// on the secure connection. /// for secure connection.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="ServerSslAuthConfiguration"/> that represents the SSL configuration used to /// A <see cref="ServerSslAuthConfiguration"/> that represents the configuration used to
/// authenticate the server and optionally the client. /// authenticate the server and optionally the client for secure connection.
/// </value> /// </value>
public ServerSslAuthConfiguration SslConfiguration { public ServerSslAuthConfiguration SslConfiguration {
get { get {
return _sslConfig; return _sslConfig ?? (_sslConfig = new ServerSslAuthConfiguration (null));
} }
set { set {