diff --git a/Example/bin/Debug/example.exe b/Example/bin/Debug/example.exe index d8ffb3f9..0ae10077 100755 Binary files a/Example/bin/Debug/example.exe and b/Example/bin/Debug/example.exe differ diff --git a/Example/bin/Debug/example.exe.mdb b/Example/bin/Debug/example.exe.mdb index 1c21d179..59c9cbc1 100644 Binary files a/Example/bin/Debug/example.exe.mdb and b/Example/bin/Debug/example.exe.mdb differ diff --git a/Example/bin/Debug/websocket-sharp.dll b/Example/bin/Debug/websocket-sharp.dll index 83633d5d..b6615231 100755 Binary files a/Example/bin/Debug/websocket-sharp.dll and b/Example/bin/Debug/websocket-sharp.dll differ diff --git a/Example/bin/Debug/websocket-sharp.dll.mdb b/Example/bin/Debug/websocket-sharp.dll.mdb index 3497ca5c..683cee97 100644 Binary files a/Example/bin/Debug/websocket-sharp.dll.mdb and b/Example/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe index 585f2b4e..042a1f30 100755 Binary files a/Example/bin/Debug_Ubuntu/example.exe and b/Example/bin/Debug_Ubuntu/example.exe differ diff --git a/Example/bin/Debug_Ubuntu/example.exe.mdb b/Example/bin/Debug_Ubuntu/example.exe.mdb index 5322718f..131d5676 100644 Binary files a/Example/bin/Debug_Ubuntu/example.exe.mdb and b/Example/bin/Debug_Ubuntu/example.exe.mdb differ diff --git a/Example/bin/Debug_Ubuntu/websocket-sharp.dll b/Example/bin/Debug_Ubuntu/websocket-sharp.dll index d8a55827..8f734496 100755 Binary files a/Example/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index ae5b58c7..1cd40672 100644 Binary files a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example/bin/Release/example.exe b/Example/bin/Release/example.exe index a45ea0b1..d0836323 100755 Binary files a/Example/bin/Release/example.exe and b/Example/bin/Release/example.exe differ diff --git a/Example/bin/Release/websocket-sharp.dll b/Example/bin/Release/websocket-sharp.dll index b0dae019..d9e3136c 100755 Binary files a/Example/bin/Release/websocket-sharp.dll and b/Example/bin/Release/websocket-sharp.dll differ diff --git a/Example/bin/Release_Ubuntu/example.exe b/Example/bin/Release_Ubuntu/example.exe index 803691fc..8e852069 100755 Binary files a/Example/bin/Release_Ubuntu/example.exe and b/Example/bin/Release_Ubuntu/example.exe differ diff --git a/Example/bin/Release_Ubuntu/websocket-sharp.dll b/Example/bin/Release_Ubuntu/websocket-sharp.dll index 25a32dc9..8525e1b8 100755 Binary files a/Example/bin/Release_Ubuntu/websocket-sharp.dll and b/Example/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/Example1/bin/Debug/example1.exe b/Example1/bin/Debug/example1.exe index 61e2c478..1e8aac75 100755 Binary files a/Example1/bin/Debug/example1.exe and b/Example1/bin/Debug/example1.exe differ diff --git a/Example1/bin/Debug/example1.exe.mdb b/Example1/bin/Debug/example1.exe.mdb index 53e6df74..ad62a6df 100644 Binary files a/Example1/bin/Debug/example1.exe.mdb and b/Example1/bin/Debug/example1.exe.mdb differ diff --git a/Example1/bin/Debug/websocket-sharp.dll b/Example1/bin/Debug/websocket-sharp.dll index 83633d5d..b6615231 100755 Binary files a/Example1/bin/Debug/websocket-sharp.dll and b/Example1/bin/Debug/websocket-sharp.dll differ diff --git a/Example1/bin/Debug/websocket-sharp.dll.mdb b/Example1/bin/Debug/websocket-sharp.dll.mdb index 3497ca5c..683cee97 100644 Binary files a/Example1/bin/Debug/websocket-sharp.dll.mdb and b/Example1/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example1/bin/Debug_Ubuntu/example1.exe b/Example1/bin/Debug_Ubuntu/example1.exe index 46c3d572..c6ee9fe5 100755 Binary files a/Example1/bin/Debug_Ubuntu/example1.exe and b/Example1/bin/Debug_Ubuntu/example1.exe differ diff --git a/Example1/bin/Debug_Ubuntu/example1.exe.mdb b/Example1/bin/Debug_Ubuntu/example1.exe.mdb index f3329eab..3c2c4b31 100644 Binary files a/Example1/bin/Debug_Ubuntu/example1.exe.mdb and b/Example1/bin/Debug_Ubuntu/example1.exe.mdb differ diff --git a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll index d8a55827..8f734496 100755 Binary files a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index ae5b58c7..1cd40672 100644 Binary files a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example1/bin/Release/example1.exe b/Example1/bin/Release/example1.exe index a472a265..bdd16376 100755 Binary files a/Example1/bin/Release/example1.exe and b/Example1/bin/Release/example1.exe differ diff --git a/Example1/bin/Release/websocket-sharp.dll b/Example1/bin/Release/websocket-sharp.dll index b0dae019..d9e3136c 100755 Binary files a/Example1/bin/Release/websocket-sharp.dll and b/Example1/bin/Release/websocket-sharp.dll differ diff --git a/Example1/bin/Release_Ubuntu/example1.exe b/Example1/bin/Release_Ubuntu/example1.exe index 0a731e85..ad23e938 100755 Binary files a/Example1/bin/Release_Ubuntu/example1.exe and b/Example1/bin/Release_Ubuntu/example1.exe differ diff --git a/Example1/bin/Release_Ubuntu/websocket-sharp.dll b/Example1/bin/Release_Ubuntu/websocket-sharp.dll index 25a32dc9..8525e1b8 100755 Binary files a/Example1/bin/Release_Ubuntu/websocket-sharp.dll and b/Example1/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/Example2/bin/Debug/example2.exe b/Example2/bin/Debug/example2.exe index d09c757a..3ec5dc9a 100755 Binary files a/Example2/bin/Debug/example2.exe and b/Example2/bin/Debug/example2.exe differ diff --git a/Example2/bin/Debug/example2.exe.mdb b/Example2/bin/Debug/example2.exe.mdb index 974656f4..db72cb61 100644 Binary files a/Example2/bin/Debug/example2.exe.mdb and b/Example2/bin/Debug/example2.exe.mdb differ diff --git a/Example2/bin/Debug/websocket-sharp.dll b/Example2/bin/Debug/websocket-sharp.dll index 83633d5d..b6615231 100755 Binary files a/Example2/bin/Debug/websocket-sharp.dll and b/Example2/bin/Debug/websocket-sharp.dll differ diff --git a/Example2/bin/Debug/websocket-sharp.dll.mdb b/Example2/bin/Debug/websocket-sharp.dll.mdb index 3497ca5c..683cee97 100644 Binary files a/Example2/bin/Debug/websocket-sharp.dll.mdb and b/Example2/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example2/bin/Debug_Ubuntu/example2.exe b/Example2/bin/Debug_Ubuntu/example2.exe index 5ef45af6..f91dba1b 100755 Binary files a/Example2/bin/Debug_Ubuntu/example2.exe and b/Example2/bin/Debug_Ubuntu/example2.exe differ diff --git a/Example2/bin/Debug_Ubuntu/example2.exe.mdb b/Example2/bin/Debug_Ubuntu/example2.exe.mdb index f9f99e04..620d38d5 100644 Binary files a/Example2/bin/Debug_Ubuntu/example2.exe.mdb and b/Example2/bin/Debug_Ubuntu/example2.exe.mdb differ diff --git a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll index d8a55827..8f734496 100755 Binary files a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index ae5b58c7..1cd40672 100644 Binary files a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example2/bin/Release/example2.exe b/Example2/bin/Release/example2.exe index 571c58bf..83b86fbd 100755 Binary files a/Example2/bin/Release/example2.exe and b/Example2/bin/Release/example2.exe differ diff --git a/Example2/bin/Release/websocket-sharp.dll b/Example2/bin/Release/websocket-sharp.dll index b0dae019..d9e3136c 100755 Binary files a/Example2/bin/Release/websocket-sharp.dll and b/Example2/bin/Release/websocket-sharp.dll differ diff --git a/Example2/bin/Release_Ubuntu/example2.exe b/Example2/bin/Release_Ubuntu/example2.exe index a0736b00..f0b3fed3 100755 Binary files a/Example2/bin/Release_Ubuntu/example2.exe and b/Example2/bin/Release_Ubuntu/example2.exe differ diff --git a/Example2/bin/Release_Ubuntu/websocket-sharp.dll b/Example2/bin/Release_Ubuntu/websocket-sharp.dll index 25a32dc9..8525e1b8 100755 Binary files a/Example2/bin/Release_Ubuntu/websocket-sharp.dll and b/Example2/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/Example3/bin/Debug/Example3.exe b/Example3/bin/Debug/Example3.exe index 39c79793..adc0a4ac 100755 Binary files a/Example3/bin/Debug/Example3.exe and b/Example3/bin/Debug/Example3.exe differ diff --git a/Example3/bin/Debug/Example3.exe.mdb b/Example3/bin/Debug/Example3.exe.mdb index 803daffb..fee38cdb 100644 Binary files a/Example3/bin/Debug/Example3.exe.mdb and b/Example3/bin/Debug/Example3.exe.mdb differ diff --git a/Example3/bin/Debug/websocket-sharp.dll b/Example3/bin/Debug/websocket-sharp.dll index 83633d5d..b6615231 100755 Binary files a/Example3/bin/Debug/websocket-sharp.dll and b/Example3/bin/Debug/websocket-sharp.dll differ diff --git a/Example3/bin/Debug/websocket-sharp.dll.mdb b/Example3/bin/Debug/websocket-sharp.dll.mdb index 3497ca5c..683cee97 100644 Binary files a/Example3/bin/Debug/websocket-sharp.dll.mdb and b/Example3/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe b/Example3/bin/Debug_Ubuntu/Example3.exe index 8568acf6..a0202ba3 100755 Binary files a/Example3/bin/Debug_Ubuntu/Example3.exe and b/Example3/bin/Debug_Ubuntu/Example3.exe differ diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb index ee021517..343365d7 100644 Binary files a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb and b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb differ diff --git a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll index d8a55827..8f734496 100755 Binary files a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index ae5b58c7..1cd40672 100644 Binary files a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example3/bin/Release/Example3.exe b/Example3/bin/Release/Example3.exe index 063e3ad7..0fd18635 100755 Binary files a/Example3/bin/Release/Example3.exe and b/Example3/bin/Release/Example3.exe differ diff --git a/Example3/bin/Release/websocket-sharp.dll b/Example3/bin/Release/websocket-sharp.dll index b0dae019..d9e3136c 100755 Binary files a/Example3/bin/Release/websocket-sharp.dll and b/Example3/bin/Release/websocket-sharp.dll differ diff --git a/Example3/bin/Release_Ubuntu/Example3.exe b/Example3/bin/Release_Ubuntu/Example3.exe index 2b0a31e9..0be43a1b 100755 Binary files a/Example3/bin/Release_Ubuntu/Example3.exe and b/Example3/bin/Release_Ubuntu/Example3.exe differ diff --git a/Example3/bin/Release_Ubuntu/websocket-sharp.dll b/Example3/bin/Release_Ubuntu/websocket-sharp.dll index 68868f17..8525e1b8 100755 Binary files a/Example3/bin/Release_Ubuntu/websocket-sharp.dll and b/Example3/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/Net/HttpListenerContext.cs b/websocket-sharp/Net/HttpListenerContext.cs index 27951da5..77e5cd09 100644 --- a/websocket-sharp/Net/HttpListenerContext.cs +++ b/websocket-sharp/Net/HttpListenerContext.cs @@ -31,13 +31,18 @@ using System; using System.Collections.Specialized; using System.IO; -using System.Net; using System.Security.Principal; using System.Text; using WebSocketSharp.Net.WebSockets; namespace WebSocketSharp.Net { + /// + /// Provides access to the HTTP request and response objects used by the class. + /// + /// + /// The HttpListenerContext class cannot be inherited. + /// public sealed class HttpListenerContext { #region Private Fields @@ -93,14 +98,33 @@ namespace WebSocketSharp.Net { #region Public Properties + /// + /// Gets the that contains the HTTP request from a client. + /// + /// + /// A that contains the HTTP request objects. + /// public HttpListenerRequest Request { get { return request; } } + /// + /// Gets the that contains the HTTP response to send to + /// the client in response to the client's request. + /// + /// + /// A that contains the HTTP response objects. + /// public HttpListenerResponse Response { get { return response; } } + /// + /// Gets the client information (identity, authentication information and security roles). + /// + /// + /// A contains the client information. + /// public IPrincipal User { get { return user; } } @@ -125,7 +149,7 @@ namespace WebSocketSharp.Net { } // TODO: throw if malformed -> 400 bad request } - + internal IPrincipal ParseBasicAuthentication (string authData) { try { @@ -135,29 +159,29 @@ namespace WebSocketSharp.Net { string password = null; int pos = -1; string authString = Encoding.Default.GetString (Convert.FromBase64String (authData)); - + // The format is DOMAIN\username:password // Domain is optional pos = authString.IndexOf (':'); - + // parse the password off the end password = authString.Substring (pos+1); - + // discard the password authString = authString.Substring (0, pos); - + // check if there is a domain pos = authString.IndexOf ('\\'); - + if (pos > 0) { //domain = authString.Substring (0, pos); user = authString.Substring (pos); } else { user = authString; } - - HttpListenerBasicIdentity identity = new HttpListenerBasicIdentity (user, password); + + var identity = new System.Net.HttpListenerBasicIdentity (user, password); // TODO: What are the roles MS sets return new GenericPrincipal (identity, new string [0]); } catch (Exception) { @@ -170,6 +194,12 @@ namespace WebSocketSharp.Net { #region Public Method + /// + /// Accepts a WebSocket connection by the . + /// + /// + /// A that contains a WebSocket connection. + /// public HttpListenerWebSocketContext AcceptWebSocket () { return new HttpListenerWebSocketContext (this); diff --git a/websocket-sharp/Net/HttpListenerException.cs b/websocket-sharp/Net/HttpListenerException.cs index b8842808..fde14f3c 100644 --- a/websocket-sharp/Net/HttpListenerException.cs +++ b/websocket-sharp/Net/HttpListenerException.cs @@ -1,6 +1,6 @@ // // HttpListenerException.cs -// Copied from System.Net.HttpListenerException +// Copied from System.Net.HttpListenerException.cs // // Author: // Gonzalo Paniagua Javier (gonzalo@novell.com) @@ -33,27 +33,79 @@ using System.Runtime.Serialization; namespace WebSocketSharp.Net { + /// + /// The exception that is thrown when an error occurs processing an HTTP request. + /// [Serializable] - public class HttpListenerException : Win32Exception - { + public class HttpListenerException : Win32Exception { + + #region Public Constructors + + /// + /// Initializes a new instance of the class. + /// public HttpListenerException () { } + /// + /// Initializes a new instance of the class + /// with the specified . + /// + /// + /// An that contains an error code. + /// public HttpListenerException (int errorCode) : base (errorCode) { } + /// + /// Initializes a new instance of the class + /// with the specified and . + /// + /// + /// An that contains an error code. + /// + /// + /// A that describes the error. + /// public HttpListenerException (int errorCode, string message) : base (errorCode, message) { } + #endregion + + #region Protected Constructor + + /// + /// Initializes a new instance of the class + /// from the specified and classes. + /// + /// + /// A that contains the information required to deserialize + /// the new object. + /// + /// + /// A . + /// protected HttpListenerException (SerializationInfo serializationInfo, StreamingContext streamingContext) : base (serializationInfo, streamingContext) { } + #endregion + + #region Property + + /// + /// Gets a value that represents the error that occurred. + /// + /// + /// An that contains an error code. + /// public override int ErrorCode { get { return base.ErrorCode; } } + + #endregion } } diff --git a/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs index 27817673..e69ab0cf 100644 --- a/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs +++ b/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs @@ -234,7 +234,7 @@ namespace WebSocketSharp.Net.WebSockets { /// Gets the client information (identity, authentication information and security roles). /// /// - /// An that contains the client information. + /// A that contains the client information. /// public override IPrincipal User { get { diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs index e786a703..acd0253f 100644 --- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs +++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs @@ -248,7 +248,7 @@ namespace WebSocketSharp.Net.WebSockets { /// Gets the client information (identity, authentication information and security roles). /// /// - /// An that contains the client information. + /// A that contains the client information. /// /// /// This property is not implemented. diff --git a/websocket-sharp/Net/WebSockets/WebSocketContext.cs b/websocket-sharp/Net/WebSockets/WebSocketContext.cs index f420c8be..cd10c2e0 100644 --- a/websocket-sharp/Net/WebSockets/WebSocketContext.cs +++ b/websocket-sharp/Net/WebSockets/WebSocketContext.cs @@ -147,7 +147,7 @@ namespace WebSocketSharp.Net.WebSockets { /// Gets the client information (identity, authentication information and security roles). /// /// - /// An that contains the client information. + /// A that contains the client information. /// public abstract IPrincipal User { get; } diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll b/websocket-sharp/bin/Debug/websocket-sharp.dll index 83633d5d..b6615231 100755 Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll and b/websocket-sharp/bin/Debug/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb index 3497ca5c..683cee97 100644 Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll index d8a55827..8f734496 100755 Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index ae5b58c7..1cd40672 100644 Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/bin/Release/websocket-sharp.dll b/websocket-sharp/bin/Release/websocket-sharp.dll index b0dae019..d9e3136c 100755 Binary files a/websocket-sharp/bin/Release/websocket-sharp.dll and b/websocket-sharp/bin/Release/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll index 68868f17..8525e1b8 100755 Binary files a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml index a7bf536f..6785e014 100644 --- a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml +++ b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml @@ -1590,6 +1590,99 @@ Stops receiving incoming requests. + + + Provides access to the HTTP request and response objects used by the class. + + + The HttpListenerContext class cannot be inherited. + + + + + Gets the that contains the HTTP request from a client. + + + A that contains the HTTP request objects. + + + + + Gets the that contains the HTTP response to send to + the client in response to the client's request. + + + A that contains the HTTP response objects. + + + + + Gets the client information (identity, authentication information and security roles). + + + A contains the client information. + + + + + Accepts a WebSocket connection by the . + + + A that contains a WebSocket connection. + + + + + The exception that is thrown when an error occurs processing an HTTP request. + + + + + Initializes a new instance of the class. + + + + + Initializes a new instance of the class + with the specified . + + + An that contains an error code. + + + + + Initializes a new instance of the class + with the specified and . + + + An that contains an error code. + + + A that describes the error. + + + + + Initializes a new instance of the class + from the specified and classes. + + + A that contains the information required to deserialize + the new object. + + + A . + + + + + Gets a value that represents the error that occurred. + + + An that contains an error code. + + Decodes an HTML-encoded string and returns the decoded string. @@ -2687,7 +2780,7 @@ Gets the client information (identity, authentication information and security roles). - An that contains the client information. + A that contains the client information. @@ -2832,7 +2925,7 @@ Gets the client information (identity, authentication information and security roles). - An that contains the client information. + A that contains the client information. This property is not implemented. @@ -2961,7 +3054,7 @@ Gets the client information (identity, authentication information and security roles). - An that contains the client information. + A that contains the client information. diff --git a/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/HttpListenerWebSocketContext.html b/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/HttpListenerWebSocketContext.html index 868c9ab9..4a49f40a 100644 --- a/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/HttpListenerWebSocketContext.html +++ b/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/HttpListenerWebSocketContext.html @@ -895,7 +895,7 @@
public override System.Security.Principal.IPrincipal User { get; }

Value

- An System.Security.Principal.IPrincipal that contains the client information. + A System.Security.Principal.IPrincipal that contains the client information.

Remarks

diff --git a/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html b/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html index 90fa920a..4e1aac40 100644 --- a/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html +++ b/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html @@ -946,7 +946,7 @@
public override System.Security.Principal.IPrincipal User { get; }

Value

- An System.Security.Principal.IPrincipal that contains the client information. + A System.Security.Principal.IPrincipal that contains the client information.

Exceptions

diff --git a/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/WebSocketContext.html b/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/WebSocketContext.html index 89deaf08..ef9ea6db 100644 --- a/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/WebSocketContext.html +++ b/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/WebSocketContext.html @@ -684,7 +684,7 @@
public abstract System.Security.Principal.IPrincipal User { get; }

Value

- An System.Security.Principal.IPrincipal that contains the client information. + A System.Security.Principal.IPrincipal that contains the client information.

Remarks

diff --git a/websocket-sharp/doc/html/WebSocketSharp.Net/HttpListenerContext.html b/websocket-sharp/doc/html/WebSocketSharp.Net/HttpListenerContext.html index 3c5a0b0d..929b6975 100644 --- a/websocket-sharp/doc/html/WebSocketSharp.Net/HttpListenerContext.html +++ b/websocket-sharp/doc/html/WebSocketSharp.Net/HttpListenerContext.html @@ -207,8 +207,8 @@

HttpListenerContext Class

- Documentation for this section has not yet been entered. -

+ Provides access to the HTTP request and response objects used by the WebSocketSharp.Net.HttpListener class. +

Syntax

public sealed class HttpListenerContext
@@ -216,8 +216,8 @@

Remarks

- Documentation for this section has not yet been entered. -
+ The HttpListenerContext class cannot be inherited. +

Requirements

Namespace: WebSocketSharp.Net
Assembly: websocket-sharp (in websocket-sharp.dll)
@@ -241,7 +241,9 @@ HttpListenerRequest - . Documentation for this section has not yet been entered. + . + Gets the WebSocketSharp.Net.HttpListenerRequest that contains the HTTP request from a client. + [read-only]
@@ -253,7 +255,10 @@ HttpListenerResponse - . Documentation for this section has not yet been entered. + . + Gets the WebSocketSharp.Net.HttpListenerResponse that contains the HTTP response to send to + the client in response to the client's request. + [read-only]
@@ -265,7 +270,9 @@ System.Security.Principal.IPrincipal - . Documentation for this section has not yet been entered. + . + Gets the client information (identity, authentication information and security roles). +
@@ -282,7 +289,9 @@ AcceptWebSocket - () : WebSocketSharp.Net.WebSockets.HttpListenerWebSocketContext
Documentation for this section has not yet been entered.
+ () : WebSocketSharp.Net.WebSockets.HttpListenerWebSocketContext
+ Accepts a WebSocket connection by the WebSocketSharp.Net.HttpListener. +
@@ -325,14 +334,14 @@

AcceptWebSocket Method

- Documentation for this section has not yet been entered. -

+ Accepts a WebSocket connection by the WebSocketSharp.Net.HttpListener. +

Syntax

public WebSocketSharp.Net.WebSockets.HttpListenerWebSocketContext AcceptWebSocket ()

Returns

- Documentation for this section has not yet been entered. -
+ A WebSocketSharp.Net.WebSockets.HttpListenerWebSocketContext that contains a WebSocket connection. +

Remarks

Documentation for this section has not yet been entered. @@ -345,14 +354,14 @@

Request Property

- Documentation for this section has not yet been entered. -

+ Gets the WebSocketSharp.Net.HttpListenerRequest that contains the HTTP request from a client. +

Syntax

public HttpListenerRequest Request { get; }

Value

- Documentation for this section has not yet been entered. -
+ A WebSocketSharp.Net.HttpListenerRequest that contains the HTTP request objects. +

Remarks

Documentation for this section has not yet been entered. @@ -365,14 +374,15 @@

Response Property

- Documentation for this section has not yet been entered. -

+ Gets the WebSocketSharp.Net.HttpListenerResponse that contains the HTTP response to send to + the client in response to the client's request. +

Syntax

public HttpListenerResponse Response { get; }

Value

- Documentation for this section has not yet been entered. -
+ A WebSocketSharp.Net.HttpListenerResponse that contains the HTTP response objects. +

Remarks

Documentation for this section has not yet been entered. @@ -385,14 +395,14 @@

User Property

- Documentation for this section has not yet been entered. -

+ Gets the client information (identity, authentication information and security roles). +

Syntax

public System.Security.Principal.IPrincipal User { get; }

Value

- Documentation for this section has not yet been entered. -
+ A System.Security.Principal.IPrincipal contains the client information. +

Remarks

Documentation for this section has not yet been entered. diff --git a/websocket-sharp/doc/html/WebSocketSharp.Net/HttpListenerException.html b/websocket-sharp/doc/html/WebSocketSharp.Net/HttpListenerException.html index 02835098..9d964895 100644 --- a/websocket-sharp/doc/html/WebSocketSharp.Net/HttpListenerException.html +++ b/websocket-sharp/doc/html/WebSocketSharp.Net/HttpListenerException.html @@ -207,8 +207,8 @@

HttpListenerException Class

- Documentation for this section has not yet been entered. -

+ The exception that is thrown when an error occurs processing an HTTP request. +

Syntax

public class HttpListenerException : System.ComponentModel.Win32Exception
@@ -243,8 +243,8 @@ ()
- Documentation for this section has not yet been entered. - + Initializes a new instance of the WebSocketSharp.Net.HttpListenerException class. + @@ -258,8 +258,9 @@ (int)
- Documentation for this section has not yet been entered. - + Initializes a new instance of the WebSocketSharp.Net.HttpListenerException class + with the specified errorCode. + @@ -273,8 +274,9 @@ (int, string)
- Documentation for this section has not yet been entered. - + Initializes a new instance of the WebSocketSharp.Net.HttpListenerException class + with the specified errorCode and message. +
@@ -295,8 +297,9 @@ (System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext) - Documentation for this section has not yet been entered. - + Initializes a new instance of the WebSocketSharp.Net.HttpListenerException class + from the specified System.Runtime.Serialization.SerializationInfo and System.Runtime.Serialization.StreamingContext classes. + @@ -315,7 +318,9 @@ int - . Documentation for this section has not yet been entered. + . + Gets a value that represents the error that occurred. + @@ -358,8 +363,8 @@

HttpListenerException Constructor

- Documentation for this section has not yet been entered. -

+ Initializes a new instance of the WebSocketSharp.Net.HttpListenerException class. +

Syntax

public HttpListenerException ()

Remarks

@@ -374,8 +379,9 @@

HttpListenerException Constructor

- Documentation for this section has not yet been entered. -

+ Initializes a new instance of the WebSocketSharp.Net.HttpListenerException class + with the specified errorCode. +

Syntax

public HttpListenerException (int errorCode)

Parameters

@@ -385,8 +391,8 @@ errorCode
- Documentation for this section has not yet been entered. -
+ An int that contains an error code. +

Remarks

@@ -401,8 +407,9 @@

HttpListenerException Constructor

- Documentation for this section has not yet been entered. -

+ Initializes a new instance of the WebSocketSharp.Net.HttpListenerException class + with the specified errorCode and message. +

Syntax

public HttpListenerException (int errorCode, string message)

Parameters

@@ -412,14 +419,14 @@ errorCode
- Documentation for this section has not yet been entered. -
+ An int that contains an error code. +
message
- Documentation for this section has not yet been entered. -
+ A string that describes the error. +

Remarks

@@ -434,8 +441,9 @@

HttpListenerException Constructor

- Documentation for this section has not yet been entered. -

+ Initializes a new instance of the WebSocketSharp.Net.HttpListenerException class + from the specified System.Runtime.Serialization.SerializationInfo and System.Runtime.Serialization.StreamingContext classes. +

Syntax

protected HttpListenerException (System.Runtime.Serialization.SerializationInfo serializationInfo, System.Runtime.Serialization.StreamingContext streamingContext)

Parameters

@@ -445,14 +453,15 @@ serializationInfo
- Documentation for this section has not yet been entered. -
+ A System.Runtime.Serialization.SerializationInfo that contains the information required to deserialize + the new WebSocketSharp.Net.HttpListenerException object. +
streamingContext
- Documentation for this section has not yet been entered. -
+ A System.Runtime.Serialization.StreamingContext. +

Remarks

@@ -467,14 +476,14 @@

ErrorCode Property

- Documentation for this section has not yet been entered. -

+ Gets a value that represents the error that occurred. +

Syntax

public override int ErrorCode { get; }

Value

- Documentation for this section has not yet been entered. -
+ An int that contains an error code. +

Remarks

Documentation for this section has not yet been entered. diff --git a/websocket-sharp/doc/html/WebSocketSharp.Net/index.html b/websocket-sharp/doc/html/WebSocketSharp.Net/index.html index db8dd350..8fa4b718 100644 --- a/websocket-sharp/doc/html/WebSocketSharp.Net/index.html +++ b/websocket-sharp/doc/html/WebSocketSharp.Net/index.html @@ -255,16 +255,16 @@ HttpListenerContext - Documentation for this section has not yet been entered. - + Provides access to the HTTP request and response objects used by the WebSocketSharp.Net.HttpListener class. + HttpListenerException - Documentation for this section has not yet been entered. - + The exception that is thrown when an error occurs processing an HTTP request. + diff --git a/websocket-sharp/doc/html/index.html b/websocket-sharp/doc/html/index.html index 99b86e64..ac2714d8 100644 --- a/websocket-sharp/doc/html/index.html +++ b/websocket-sharp/doc/html/index.html @@ -347,16 +347,16 @@ HttpListenerContext - Documentation for this section has not yet been entered. - + Provides access to the HTTP request and response objects used by the WebSocketSharp.Net.HttpListener class. + HttpListenerException - Documentation for this section has not yet been entered. - + The exception that is thrown when an error occurs processing an HTTP request. + diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/HttpListenerWebSocketContext.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/HttpListenerWebSocketContext.xml index 6ba0d283..e1040d42 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/HttpListenerWebSocketContext.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/HttpListenerWebSocketContext.xml @@ -237,7 +237,7 @@ Gets the client information (identity, authentication information and security roles). - An that contains the client information. + A that contains the client information. To be added. diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.xml index f87a0b38..18aad13d 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.xml @@ -246,7 +246,7 @@ Gets the client information (identity, authentication information and security roles). - An that contains the client information. + A that contains the client information. To be added. diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/WebSocketContext.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/WebSocketContext.xml index 70421129..8a81e2f5 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/WebSocketContext.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Net.WebSockets/WebSocketContext.xml @@ -217,7 +217,7 @@ Gets the client information (identity, authentication information and security roles). - An that contains the client information. + A that contains the client information. To be added. diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Net/HttpListenerContext.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Net/HttpListenerContext.xml index 2a202f87..7fefc6cb 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp.Net/HttpListenerContext.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Net/HttpListenerContext.xml @@ -9,8 +9,12 @@ - To be added. - To be added. + + Provides access to the HTTP request and response objects used by the class. + + + The HttpListenerContext class cannot be inherited. + @@ -22,8 +26,12 @@ - To be added. - To be added. + + Accepts a WebSocket connection by the . + + + A that contains a WebSocket connection. + To be added. @@ -35,8 +43,12 @@ WebSocketSharp.Net.HttpListenerRequest - To be added. - To be added. + + Gets the that contains the HTTP request from a client. + + + A that contains the HTTP request objects. + To be added. @@ -48,8 +60,13 @@ WebSocketSharp.Net.HttpListenerResponse - To be added. - To be added. + + Gets the that contains the HTTP response to send to + the client in response to the client's request. + + + A that contains the HTTP response objects. + To be added. @@ -61,8 +78,12 @@ System.Security.Principal.IPrincipal - To be added. - To be added. + + Gets the client information (identity, authentication information and security roles). + + + A contains the client information. + To be added. diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Net/HttpListenerException.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Net/HttpListenerException.xml index 2deafc7f..04f00d59 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp.Net/HttpListenerException.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Net/HttpListenerException.xml @@ -9,7 +9,9 @@ - To be added. + + The exception that is thrown when an error occurs processing an HTTP request. + To be added. @@ -19,7 +21,9 @@ Constructor - To be added. + + Initializes a new instance of the class. + To be added. @@ -31,8 +35,13 @@ - To be added. - To be added. + + An that contains an error code. + + + Initializes a new instance of the class + with the specified . + To be added. @@ -45,9 +54,16 @@ - To be added. - To be added. - To be added. + + An that contains an error code. + + + A that describes the error. + + + Initializes a new instance of the class + with the specified and . + To be added. @@ -60,9 +76,17 @@ - To be added. - To be added. - To be added. + + A that contains the information required to deserialize + the new object. + + + A . + + + Initializes a new instance of the class + from the specified and classes. + To be added. @@ -74,8 +98,12 @@ System.Int32 - To be added. - To be added. + + Gets a value that represents the error that occurred. + + + An that contains an error code. + To be added. diff --git a/websocket-sharp/doc/mdoc/index.xml b/websocket-sharp/doc/mdoc/index.xml index d805a609..28fbc110 100644 --- a/websocket-sharp/doc/mdoc/index.xml +++ b/websocket-sharp/doc/mdoc/index.xml @@ -1,6 +1,6 @@ - + [00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 11 00 00 00 29 17 fb 89 fe c3 91 f7 2b cb 8b e2 61 d2 3f 05 93 6d 65 a8 9e 63 72 a6 f5 d5 2c f2 9d 20 fa 0b c0 70 6a f6 88 7e 8b 90 3f 39 f5 76 c8 48 e0 bb 7b b2 7b ed d3 10 a7 1a 0f 70 98 0f 7f f4 4b 53 09 d2 a5 ef 36 c3 56 b4 aa f0 91 72 63 25 07 89 e0 93 3e 3f 2e f2 b9 73 0e 12 15 5d 43 56 c3 f4 70 a5 89 fe f7 f6 ac 3e 77 c2 d8 d0 84 91 f4 0c d1 f3 8e dc c3 c3 b8 38 3d 0c bf 17 de 20 78 c1 ] diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb index 1a5b46dc..d2253736 100644 Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ