Browse Source

Fix for issue #21

pull/22/merge
sta 12 years ago
parent
commit
dcd0052bc8
  1. 10
      .gitignore
  2. 5
      websocket-sharp/Net/HttpListener.cs
  3. 3
      websocket-sharp/Net/WebHeaderCollection.cs
  4. 2
      websocket-sharp/Server/WebSocketServiceHostManager.cs
  5. 2
      websocket-sharp/Server/WebSocketSessionManager.cs

10
.gitignore

@ -1,6 +1,14 @@
## Ignore MonoDevelop build results and temporary files.
## Ignore build results and temporary files.
Backup*
_UpgradeReport_Files
bin
obj
*.mdb
*.pdb
*.pidb
*.suo
*.user
*.userprefs
UpgradeLog*.*

5
websocket-sharp/Net/HttpListener.cs

@ -85,8 +85,9 @@ namespace WebSocketSharp.Net {
/// Gets or sets the scheme used to authenticate the clients.
/// </summary>
/// <value>
/// One of the <see cref="AuthenticationSchemes"/> values that indicates the scheme used to
/// authenticate the clients. The default value is <see cref="AuthenticationSchemes.Anonymous"/>.
/// One of the <see cref="WebSocketSharp.Net.AuthenticationSchemes"/> values that indicates
/// the scheme used to authenticate the clients.
/// The default value is <see cref="WebSocketSharp.Net.AuthenticationSchemes.Anonymous"/>.
/// </value>
/// <exception cref="ObjectDisposedException">
/// This object has been closed.

3
websocket-sharp/Net/WebHeaderCollection.cs

@ -410,7 +410,8 @@ namespace WebSocketSharp.Net
/// Gets a collection of header names in the collection.
/// </summary>
/// <value>
/// A <see cref="KeysCollection"/> that contains a collection of header names in the collection.
/// A <see cref="NameObjectCollectionBase.KeysCollection"/> that contains a collection
/// of header names in the collection.
/// </value>
public override KeysCollection Keys
{

2
websocket-sharp/Server/WebSocketServiceHostManager.cs

@ -703,7 +703,7 @@ namespace WebSocketSharp.Server
if (message == null || message.Length == 0)
return Broadping ();
byte [] data;
byte [] data = null;
var msg = _state.CheckIfStarted () ??
(data = Encoding.UTF8.GetBytes (message)).CheckIfValidPingData ();

2
websocket-sharp/Server/WebSocketSessionManager.cs

@ -601,7 +601,7 @@ namespace WebSocketSharp.Server
if (message == null || message.Length == 0)
return Broadping ();
byte [] data;
byte [] data = null;
var msg = _state.CheckIfStarted () ??
(data = Encoding.UTF8.GetBytes (message)).CheckIfValidPingData ();

Loading…
Cancel
Save