diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe index 5f480fee..1c5dd95c 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 1bec63f1..496d4e27 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 58f0052b..9ec61596 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 77047401..0df3d850 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/Example1/bin/Debug_Ubuntu/example1.exe b/Example1/bin/Debug_Ubuntu/example1.exe index 038d8852..fe314e5b 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 63193eaa..29a9cb13 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 58f0052b..9ec61596 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 77047401..0df3d850 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/Example2/bin/Debug_Ubuntu/example2.exe b/Example2/bin/Debug_Ubuntu/example2.exe index a253ba56..5fd9ffb1 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 7646a826..def5486d 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 58f0052b..9ec61596 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 77047401..0df3d850 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/Example3/Example3.pidb b/Example3/Example3.pidb index 4458a67b..e9ab2bd4 100644 Binary files a/Example3/Example3.pidb and b/Example3/Example3.pidb differ diff --git a/Example3/Program.cs b/Example3/Program.cs index 2f5654ad..dd437173 100644 --- a/Example3/Program.cs +++ b/Example3/Program.cs @@ -16,9 +16,9 @@ namespace Example3 _httpsv.AddWebSocketService("/Echo"); _httpsv.AddWebSocketService("/Chat"); - _httpsv.OnResponseToGet += (sender, e) => + _httpsv.OnGet += (sender, e) => { - onResponseToGet(e); + onGet(e); }; _httpsv.OnError += (sender, e) => @@ -46,7 +46,7 @@ namespace Example3 return _httpsv.GetFile(path); } - private static void onResponseToGet(ResponseEventArgs eventArgs) + private static void onGet(HttpRequestEventArgs eventArgs) { var request = eventArgs.Request; var response = eventArgs.Response; diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe b/Example3/bin/Debug_Ubuntu/Example3.exe index e8670ce7..eead21a2 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 667cde9d..673e1880 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 58f0052b..9ec61596 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 77047401..0df3d850 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_Ubuntu/Example3.exe b/Example3/bin/Release_Ubuntu/Example3.exe index fb0ba959..2b0a31e9 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 25a32dc9..68868f17 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.userprefs b/websocket-sharp.userprefs index 4f01e372..9b182064 100644 --- a/websocket-sharp.userprefs +++ b/websocket-sharp.userprefs @@ -1,5 +1,5 @@  - + diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs index baf2f63f..f62610ab 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -560,6 +560,54 @@ namespace WebSocketSharp { return false; } + /// + /// Determines whether the specified is the HTTP Upgrade request + /// to switch to the specified . + /// + /// + /// true if the specified is the HTTP Upgrade request + /// to switch to the specified ; otherwise, false. + /// + /// + /// A that contains an HTTP request information. + /// + /// + /// A that contains a protocol name. + /// + /// + /// + /// is . + /// + /// + /// -or- + /// + /// + /// is . + /// + /// + /// + /// is . + /// + public static bool IsUpgradeTo(this HttpListenerRequest request, string protocol) + { + if (request.IsNull()) + throw new ArgumentNullException("request"); + + if (protocol.IsNull()) + throw new ArgumentNullException("protocol"); + + if (protocol.IsEmpty()) + throw new ArgumentException("Must not be empty.", "protocol"); + + if (!request.Headers.Exists("Upgrade", protocol)) + return false; + + if (!request.Headers.Exists("Connection", "Upgrade")) + return false; + + return true; + } + /// /// Determines whether the specified is valid absolute path. /// diff --git a/websocket-sharp/Server/ResponseEventArgs.cs b/websocket-sharp/Server/HttpRequestEventArgs.cs similarity index 87% rename from websocket-sharp/Server/ResponseEventArgs.cs rename to websocket-sharp/Server/HttpRequestEventArgs.cs index dac81456..87cbbdba 100644 --- a/websocket-sharp/Server/ResponseEventArgs.cs +++ b/websocket-sharp/Server/HttpRequestEventArgs.cs @@ -1,6 +1,6 @@ #region MIT License /* - * ResponseEventArgs.cs + * HttpRequestEventArgs.cs * * The MIT License * @@ -32,18 +32,18 @@ using WebSocketSharp.Net; namespace WebSocketSharp.Server { /// - /// Contains the event data associated with the response events of the class. + /// Contains the event data associated with the HTTP request events of the class. /// /// - /// A response event occurs when a instance receives an HTTP request. + /// An HTTP request event occurs when a instance receives an HTTP request. /// If you want to get the HTTP request objects, you should access the property. /// If you want to get the HTTP response objects to send, you should access the property. /// - public class ResponseEventArgs : EventArgs + public class HttpRequestEventArgs : EventArgs { #region Constructor - internal ResponseEventArgs(HttpListenerContext context) + internal HttpRequestEventArgs(HttpListenerContext context) { Request = context.Request; Response = context.Response; diff --git a/websocket-sharp/Server/HttpServer.cs b/websocket-sharp/Server/HttpServer.cs index e69371f4..c90e084a 100644 --- a/websocket-sharp/Server/HttpServer.cs +++ b/websocket-sharp/Server/HttpServer.cs @@ -37,7 +37,7 @@ using WebSocketSharp.Net; namespace WebSocketSharp.Server { /// - /// Provides the functions of a simple HTTP server that allows to accept the WebSocket connection requests. + /// Provides a simple HTTP server that allows to accept the WebSocket connection requests. /// /// /// @@ -141,55 +141,55 @@ namespace WebSocketSharp.Server { #region Events + /// + /// Occurs when the server receives an HTTP CONNECT request. + /// + public event EventHandler OnConnect; + + /// + /// Occurs when the server receives an HTTP DELETE request. + /// + public event EventHandler OnDelete; + /// /// Occurs when the server gets an error. /// public event EventHandler OnError; - /// - /// Occurs when the server receives an HTTP CONNECT request. - /// - public event EventHandler OnResponseToConnect; - - /// - /// Occurs when the server receives an HTTP DELETE request. - /// - public event EventHandler OnResponseToDelete; - /// /// Occurs when the server receives an HTTP GET request. /// - public event EventHandler OnResponseToGet; + public event EventHandler OnGet; /// /// Occurs when the server receives an HTTP HEAD request. /// - public event EventHandler OnResponseToHead; + public event EventHandler OnHead; /// /// Occurs when the server receives an HTTP OPTIONS request. /// - public event EventHandler OnResponseToOptions; + public event EventHandler OnOptions; /// /// Occurs when the server receives an HTTP PATCH request. /// - public event EventHandler OnResponseToPatch; + public event EventHandler OnPatch; /// /// Occurs when the server receives an HTTP POST request. /// - public event EventHandler OnResponseToPost; + public event EventHandler OnPost; /// /// Occurs when the server receives an HTTP PUT request. /// - public event EventHandler OnResponseToPut; + public event EventHandler OnPut; /// /// Occurs when the server receives an HTTP TRACE request. /// - public event EventHandler OnResponseToTrace; + public event EventHandler OnTrace; #endregion @@ -217,17 +217,6 @@ namespace WebSocketSharp.Server { configureFromConfigFile(); } - private bool isUpgrade(HttpListenerRequest request, string value) - { - if (!request.Headers.Exists("Upgrade", value)) - return false; - - if (!request.Headers.Exists("Connection", "Upgrade")) - return false; - - return true; - } - private void onError(string message) { #if DEBUG @@ -238,6 +227,99 @@ namespace WebSocketSharp.Server { OnError.Emit(this, new ErrorEventArgs(message)); } + private void onRequest(HttpListenerContext context) + { + var req = context.Request; + var res = context.Response; + var eventArgs = new HttpRequestEventArgs(context); + + if (req.HttpMethod == "GET" && !OnGet.IsNull()) + { + OnGet(this, eventArgs); + return; + } + + if (req.HttpMethod == "HEAD" && !OnHead.IsNull()) + { + OnHead(this, eventArgs); + return; + } + + if (req.HttpMethod == "POST" && !OnPost.IsNull()) + { + OnPost(this, eventArgs); + return; + } + + if (req.HttpMethod == "PUT" && !OnPut.IsNull()) + { + OnPut(this, eventArgs); + return; + } + + if (req.HttpMethod == "DELETE" && !OnDelete.IsNull()) + { + OnDelete(this, eventArgs); + return; + } + + if (req.HttpMethod == "OPTIONS" && !OnOptions.IsNull()) + { + OnOptions(this, eventArgs); + return; + } + + if (req.HttpMethod == "TRACE" && !OnTrace.IsNull()) + { + OnTrace(this, eventArgs); + return; + } + + if (req.HttpMethod == "CONNECT" && !OnConnect.IsNull()) + { + OnConnect(this, eventArgs); + return; + } + + if (req.HttpMethod == "PATCH" && !OnPatch.IsNull()) + { + OnPatch(this, eventArgs); + return; + } + + res.StatusCode = (int)HttpStatusCode.NotImplemented; + } + + private void processRequestAsync(HttpListenerContext context) + { + WaitCallback callback = (state) => + { + var req = context.Request; + var res = context.Response; + + try + { + if (req.IsUpgradeTo("websocket")) + { + if (upgradeToWebSocket(context)) + return; + } + else + { + onRequest(context); + } + + res.Close(); + } + catch (Exception ex) + { + onError(ex.Message); + } + }; + + ThreadPool.QueueUserWorkItem(callback); + } + private void receiveRequest() { while (true) @@ -245,7 +327,7 @@ namespace WebSocketSharp.Server { try { var context = _listener.GetContext(); - respondAsync(context); + processRequestAsync(context); } catch (HttpListenerException) { @@ -260,99 +342,6 @@ namespace WebSocketSharp.Server { } } - private void respond(HttpListenerContext context) - { - var req = context.Request; - var res = context.Response; - var eventArgs = new ResponseEventArgs(context); - - if (req.HttpMethod == "GET" && !OnResponseToGet.IsNull()) - { - OnResponseToGet(this, eventArgs); - return; - } - - if (req.HttpMethod == "HEAD" && !OnResponseToHead.IsNull()) - { - OnResponseToHead(this, eventArgs); - return; - } - - if (req.HttpMethod == "POST" && !OnResponseToPost.IsNull()) - { - OnResponseToPost(this, eventArgs); - return; - } - - if (req.HttpMethod == "PUT" && !OnResponseToPut.IsNull()) - { - OnResponseToPut(this, eventArgs); - return; - } - - if (req.HttpMethod == "DELETE" && !OnResponseToDelete.IsNull()) - { - OnResponseToDelete(this, eventArgs); - return; - } - - if (req.HttpMethod == "OPTIONS" && !OnResponseToOptions.IsNull()) - { - OnResponseToOptions(this, eventArgs); - return; - } - - if (req.HttpMethod == "TRACE" && !OnResponseToTrace.IsNull()) - { - OnResponseToTrace(this, eventArgs); - return; - } - - if (req.HttpMethod == "CONNECT" && !OnResponseToConnect.IsNull()) - { - OnResponseToConnect(this, eventArgs); - return; - } - - if (req.HttpMethod == "PATCH" && !OnResponseToPatch.IsNull()) - { - OnResponseToPatch(this, eventArgs); - return; - } - - res.StatusCode = (int)HttpStatusCode.NotImplemented; - } - - private void respondAsync(HttpListenerContext context) - { - WaitCallback callback = (state) => - { - var req = context.Request; - var res = context.Response; - - try - { - if (isUpgrade(req, "websocket")) - { - if (upgradeToWebSocket(context)) - return; - } - else - { - respond(context); - } - - res.Close(); - } - catch (Exception ex) - { - onError(ex.Message); - } - }; - - ThreadPool.QueueUserWorkItem(callback); - } - private void startReceiveRequestThread() { _receiveRequestThread = new Thread(new ThreadStart(receiveRequest)); @@ -430,7 +419,7 @@ namespace WebSocketSharp.Server { } /// - /// Starts to receive incoming requests. + /// Starts the . /// public void Start() { @@ -439,7 +428,7 @@ namespace WebSocketSharp.Server { } /// - /// Stops receiving incoming requests. + /// Shuts down the . /// public void Stop() { diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll index 58f0052b..9ec61596 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 77047401..0df3d850 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_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll index 06855dcd..68868f17 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 40441524..a7bf536f 100644 --- a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml +++ b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml @@ -277,6 +277,36 @@ A to test. + + + Determines whether the specified is the HTTP Upgrade request + to switch to the specified . + + + true if the specified is the HTTP Upgrade request + to switch to the specified ; otherwise, false. + + + A that contains an HTTP request information. + + + A that contains a protocol name. + + + + is . + + + -or- + + + is . + + + + is . + + Determines whether the specified is valid absolute path. @@ -1590,7 +1620,7 @@ - Provides the functions of a simple HTTP server that allows to accept the WebSocket connection requests. + Provides a simple HTTP server that allows to accept the WebSocket connection requests. @@ -1626,52 +1656,52 @@ An that contains a port number. + + + Occurs when the server receives an HTTP CONNECT request. + + + + + Occurs when the server receives an HTTP DELETE request. + + Occurs when the server gets an error. - - - Occurs when the server receives an HTTP CONNECT request. - - - - - Occurs when the server receives an HTTP DELETE request. - - - + Occurs when the server receives an HTTP GET request. - + Occurs when the server receives an HTTP HEAD request. - + Occurs when the server receives an HTTP OPTIONS request. - + Occurs when the server receives an HTTP PATCH request. - + Occurs when the server receives an HTTP POST request. - + Occurs when the server receives an HTTP PUT request. - + Occurs when the server receives an HTTP TRACE request. @@ -1725,40 +1755,14 @@ - Starts to receive incoming requests. + Starts the . - Stops receiving incoming requests. + Shuts down the . - - - Contains the event data associated with the response events of the class. - - - A response event occurs when a instance receives an HTTP request. - If you want to get the HTTP request objects, you should access the property. - If you want to get the HTTP response objects to send, you should access the property. - - - - - Gets the HTTP request objects sent from a client. - - - A that contains the HTTP request objects. - - - - - Gets the HTTP response objects to send to the client in response to the client's request. - - - A that contains the HTTP response objects. - - Provides the HTTP version numbers. @@ -3070,5 +3074,31 @@ When this method returns, contains the with the specified , if the is found; otherwise, . + + + Contains the event data associated with the HTTP request events of the class. + + + An HTTP request event occurs when a instance receives an HTTP request. + If you want to get the HTTP request objects, you should access the property. + If you want to get the HTTP response objects to send, you should access the property. + + + + + Gets the HTTP request objects sent from a client. + + + A that contains the HTTP request objects. + + + + + Gets the HTTP response objects to send to the client in response to the client's request. + + + A that contains the HTTP response objects. + + diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/HttpRequestEventArgs.html b/websocket-sharp/doc/html/WebSocketSharp.Server/HttpRequestEventArgs.html new file mode 100644 index 00000000..f79b47d8 --- /dev/null +++ b/websocket-sharp/doc/html/WebSocketSharp.Server/HttpRequestEventArgs.html @@ -0,0 +1,348 @@ + + + WebSocketSharp.Server.HttpRequestEventArgs + + + + + +
+ websocket-sharp : WebSocketSharp.Server Namespace
+
+

+ Overview +

+

+ Signature +

+

+ Remarks +

+

+ Members +

+

+ Member Details +

+
+

HttpRequestEventArgs Class

+

+ Contains the event data associated with the HTTP request events of the WebSocketSharp.Server.HttpServer class. +

+
+

Syntax

+
public class HttpRequestEventArgs : EventArgs
+
+
+

Remarks

+
+ An HTTP request event occurs when a WebSocketSharp.Server.HttpServer instance receives an HTTP request. + If you want to get the HTTP request objects, you should access the ResponseEventArgs.Request property. + If you want to get the HTTP response objects to send, you should access the ResponseEventArgs.Response property. +
+

Requirements

+
+ Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
+

Members

+
+

+ See Also: Inherited members from + EventArgs. +

+

Public Properties

+
+
+ + + + + + + + + + + +
[read-only]
 + + Request + + + + WebSocketSharp.Net.HttpListenerRequest + . + Gets the HTTP request objects sent from a client. +
[read-only]
 + + Response + + + + WebSocketSharp.Net.HttpListenerResponse + . + Gets the HTTP response objects to send to the client in response to the client's request. +
+
+
+

Extension Methods

+
+
+ + + + + + + + + +
+
static
+ 		+ + IsNull<T> + (this T) : bool
+ Determines whether the specified object is null. +
+
static
+ 		+ + IsNullDo<T> + (this T, Action) : bool
+ Determines whether the specified object is null. + And invokes the specified Action delegate if the specified object is null. +
+
+
+
+
+
+

Member Details

+
+

Request Property

+
+

+ Gets the HTTP request objects sent from a client. +

+

Syntax

+
public WebSocketSharp.Net.HttpListenerRequest Request { get; }
+

Value

+
+ A WebSocketSharp.Net.HttpListenerRequest that contains the HTTP request objects. +
+

Remarks

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

Requirements

+
+ Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
+
+
+

Response Property

+
+

+ Gets the HTTP response objects to send to the client in response to the client's request. +

+

Syntax

+
public WebSocketSharp.Net.HttpListenerResponse Response { get; }
+

Value

+
+ A WebSocketSharp.Net.HttpListenerResponse that contains the HTTP response objects. +
+

Remarks

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

Requirements

+
+ Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/HttpServer.html b/websocket-sharp/doc/html/WebSocketSharp.Server/HttpServer.html index 9b9816ae..b70a14a6 100644 --- a/websocket-sharp/doc/html/WebSocketSharp.Server/HttpServer.html +++ b/websocket-sharp/doc/html/WebSocketSharp.Server/HttpServer.html @@ -207,7 +207,7 @@

HttpServer Class

- Provides the functions of a simple HTTP server that allows to accept the WebSocket connection requests. + Provides a simple HTTP server that allows to accept the WebSocket connection requests.

Syntax

@@ -383,7 +383,7 @@ Start ()
- Starts to receive incoming requests. + Starts the WebSocketSharp.Server.HttpServer.
@@ -395,7 +395,7 @@ Stop ()
- Stops receiving incoming requests. + Shuts down the WebSocketSharp.Server.HttpServer.
@@ -405,6 +405,34 @@
+ + + + + + + + + + - - - - - - - - - - + + + + @@ -218,14 +226,6 @@ Exposes the methods and property for the WebSocket service host. - - - - + + + + @@ -1474,6 +1486,78 @@ Namespace: WebSocketSharp
Assembly: websocket-sharp (in websocket-sharp.dll)
+

IsUpgradeTo Method

+
+

+ Determines whether the specified WebSocketSharp.Net.HttpListenerRequest is the HTTP Upgrade request + to switch to the specified protocol. +

+

Syntax

+
public static bool IsUpgradeTo (this WebSocketSharp.Net.HttpListenerRequest request, string protocol)
+

Parameters

+
+
+
+ request +
+
+ A WebSocketSharp.Net.HttpListenerRequest that contains an HTTP request information. +
+
+ protocol +
+
+ A string that contains a protocol name. +
+
+
+

Returns

+
+ true if the specified WebSocketSharp.Net.HttpListenerRequest is the HTTP Upgrade request + to switch to the specified protocol; otherwise, false. +
+

Exceptions

+
+
+
+
+ 		+ + OnConnect + + + Occurs when the server receives an HTTP CONNECT request. +
+
+
+ 		+ + OnDelete + + + Occurs when the server receives an HTTP DELETE request. +
@@ -426,35 +454,7 @@
- OnResponseToConnect - - - Occurs when the server receives an HTTP CONNECT request. -
-
-
- 		- - OnResponseToDelete - - - Occurs when the server receives an HTTP DELETE request. -
-
-
- 		- - OnResponseToGet + OnGet @@ -468,7 +468,7 @@ - OnResponseToHead + OnHead @@ -482,7 +482,7 @@ - OnResponseToOptions + OnOptions @@ -496,7 +496,7 @@ - OnResponseToPatch + OnPatch @@ -510,7 +510,7 @@ - OnResponseToPost + OnPost @@ -524,7 +524,7 @@ - OnResponseToPut + OnPut @@ -538,7 +538,7 @@ - OnResponseToTrace + OnTrace @@ -697,6 +697,38 @@ Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
+

OnConnect Event

+
+

+ Occurs when the server receives an HTTP CONNECT request. +

+

Syntax

+
public event EventHandler<HttpRequestEventArgs> OnConnect
+

Remarks

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

Requirements

+
+ Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
+
+
+

OnDelete Event

+
+

+ Occurs when the server receives an HTTP DELETE request. +

+

Syntax

+
public event EventHandler<HttpRequestEventArgs> OnDelete
+

Remarks

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

Requirements

+
+ Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
+
+

OnError Event

@@ -713,147 +745,115 @@ Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)

-

OnResponseToConnect Event

-
-

- Occurs when the server receives an HTTP CONNECT request. -

-

Syntax

-
public event EventHandler<ResponseEventArgs> OnResponseToConnect
-

Remarks

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

Requirements

-
- Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
-
-
-

OnResponseToDelete Event

-
-

- Occurs when the server receives an HTTP DELETE request. -

-

Syntax

-
public event EventHandler<ResponseEventArgs> OnResponseToDelete
-

Remarks

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

Requirements

-
- Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
-
-
-

OnResponseToGet Event

-
+

OnGet Event

+

Occurs when the server receives an HTTP GET request.

Syntax

-
public event EventHandler<ResponseEventArgs> OnResponseToGet
+
public event EventHandler<HttpRequestEventArgs> OnGet

Remarks

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

Requirements

-
+
Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
-

OnResponseToHead Event

-
+

OnHead Event

+

Occurs when the server receives an HTTP HEAD request.

Syntax

-
public event EventHandler<ResponseEventArgs> OnResponseToHead
+
public event EventHandler<HttpRequestEventArgs> OnHead

Remarks

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

Requirements

-
+
Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
-

OnResponseToOptions Event

-
+

OnOptions Event

+

Occurs when the server receives an HTTP OPTIONS request.

Syntax

-
public event EventHandler<ResponseEventArgs> OnResponseToOptions
+
public event EventHandler<HttpRequestEventArgs> OnOptions

Remarks

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

Requirements

-
+
Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
-

OnResponseToPatch Event

-
+

OnPatch Event

+

Occurs when the server receives an HTTP PATCH request.

Syntax

-
public event EventHandler<ResponseEventArgs> OnResponseToPatch
+
public event EventHandler<HttpRequestEventArgs> OnPatch

Remarks

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

Requirements

-
+
Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
-

OnResponseToPost Event

-
+

OnPost Event

+

Occurs when the server receives an HTTP POST request.

Syntax

-
public event EventHandler<ResponseEventArgs> OnResponseToPost
+
public event EventHandler<HttpRequestEventArgs> OnPost

Remarks

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

Requirements

-
+
Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
-

OnResponseToPut Event

-
+

OnPut Event

+

Occurs when the server receives an HTTP PUT request.

Syntax

-
public event EventHandler<ResponseEventArgs> OnResponseToPut
+
public event EventHandler<HttpRequestEventArgs> OnPut

Remarks

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

Requirements

-
+
Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
-

OnResponseToTrace Event

-
+

OnTrace Event

+

Occurs when the server receives an HTTP TRACE request.

Syntax

-
public event EventHandler<ResponseEventArgs> OnResponseToTrace
+
public event EventHandler<HttpRequestEventArgs> OnTrace

Remarks

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

Requirements

-
+
Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
@@ -900,7 +900,7 @@

Start Method

- Starts to receive incoming requests. + Starts the WebSocketSharp.Server.HttpServer.

Syntax

public void Start ()
@@ -916,7 +916,7 @@

Stop Method

- Stops receiving incoming requests. + Shuts down the WebSocketSharp.Server.HttpServer.

Syntax

public void Stop ()
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/RequestEventArgs.html b/websocket-sharp/doc/html/WebSocketSharp.Server/RequestEventArgs.html new file mode 100644 index 00000000..78a3f847 --- /dev/null +++ b/websocket-sharp/doc/html/WebSocketSharp.Server/RequestEventArgs.html @@ -0,0 +1,348 @@ + + + WebSocketSharp.Server.RequestEventArgs + + + + + +
+ websocket-sharp : WebSocketSharp.Server Namespace
+
+

+ Overview +

+

+ Signature +

+

+ Remarks +

+

+ Members +

+

+ Member Details +

+
+

RequestEventArgs Class

+

+ Contains the event data associated with the request events of the WebSocketSharp.Server.HttpServer class. +

+
+

Syntax

+
public class RequestEventArgs : EventArgs
+
+
+

Remarks

+
+ A request event occurs when a WebSocketSharp.Server.HttpServer instance receives an HTTP request. + If you want to get the HTTP request objects, you should access the ResponseEventArgs.Request property. + If you want to get the HTTP response objects to send, you should access the ResponseEventArgs.Response property. +
+

Requirements

+
+ Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
+

Members

+
+

+ See Also: Inherited members from + EventArgs. +

+

Public Properties

+
+
+ + + + + + + + + + + +
[read-only]
 + + Request + + + + WebSocketSharp.Net.HttpListenerRequest + . + Gets the HTTP request objects sent from a client. +
[read-only]
 + + Response + + + + WebSocketSharp.Net.HttpListenerResponse + . + Gets the HTTP response objects to send to the client in response to the client's request. +
+
+
+

Extension Methods

+
+
+ + + + + + + + + +
+
static
+ 		+ + IsNull<T> + (this T) : bool
+ Determines whether the specified object is null. +
+
static
+ 		+ + IsNullDo<T> + (this T, Action) : bool
+ Determines whether the specified object is null. + And invokes the specified Action delegate if the specified object is null. +
+
+
+
+
+
+

Member Details

+
+

Request Property

+
+

+ Gets the HTTP request objects sent from a client. +

+

Syntax

+
public WebSocketSharp.Net.HttpListenerRequest Request { get; }
+

Value

+
+ A WebSocketSharp.Net.HttpListenerRequest that contains the HTTP request objects. +
+

Remarks

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

Requirements

+
+ Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
+
+
+

Response Property

+
+

+ Gets the HTTP response objects to send to the client in response to the client's request. +

+

Syntax

+
public WebSocketSharp.Net.HttpListenerResponse Response { get; }
+

Value

+
+ A WebSocketSharp.Net.HttpListenerResponse that contains the HTTP response objects. +
+

Remarks

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

Requirements

+
+ Namespace: WebSocketSharp.Server
Assembly: websocket-sharp (in websocket-sharp.dll)
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/index.html b/websocket-sharp/doc/html/WebSocketSharp.Server/index.html index 4cd86c47..0c860a27 100644 --- a/websocket-sharp/doc/html/WebSocketSharp.Server/index.html +++ b/websocket-sharp/doc/html/WebSocketSharp.Server/index.html @@ -202,12 +202,20 @@
Type Description
+ HttpRequestEventArgs + + Contains the event data associated with the HTTP request events of the WebSocketSharp.Server.HttpServer class. +
HttpServer - Provides the functions of a simple HTTP server that allows to accept the WebSocket connection requests. + Provides a simple HTTP server that allows to accept the WebSocket connection requests.
- ResponseEventArgs - - Contains the event data associated with the response events of the WebSocketSharp.Server.HttpServer class. -
WebSocketServer diff --git a/websocket-sharp/doc/html/WebSocketSharp/Ext.html b/websocket-sharp/doc/html/WebSocketSharp/Ext.html index 0101c943..c4a28db3 100644 --- a/websocket-sharp/doc/html/WebSocketSharp/Ext.html +++ b/websocket-sharp/doc/html/WebSocketSharp/Ext.html @@ -440,6 +440,18 @@ IsPredefinedScheme (this string) : bool
Determines whether the specified string is predefined scheme. +
+
static
+ 		+ + IsUpgradeTo + (this WebSocketSharp.Net.HttpListenerRequest, string) : bool
+ Determines whether the specified WebSocketSharp.Net.HttpListenerRequest is the HTTP Upgrade request + to switch to the specified protocol.
+ + + + + + + + + + + + +
TypeReason
+ ArgumentNullException + +

+ request is null. +

+

+ -or- +

+

+ protocol is null. +

+
+ ArgumentException + + protocol is string.Empty. +
+ +

Remarks

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

Requirements

+
+ Namespace: WebSocketSharp
Assembly: websocket-sharp (in websocket-sharp.dll)
+
+

IsValidAbsolutePath Method

diff --git a/websocket-sharp/doc/html/index.html b/websocket-sharp/doc/html/index.html index 874ef5c5..99b86e64 100644 --- a/websocket-sharp/doc/html/index.html +++ b/websocket-sharp/doc/html/index.html @@ -450,12 +450,20 @@ Type Description + + + HttpRequestEventArgs + + + Contains the event data associated with the HTTP request events of the WebSocketSharp.Server.HttpServer class. + + HttpServer - Provides the functions of a simple HTTP server that allows to accept the WebSocket connection requests. + Provides a simple HTTP server that allows to accept the WebSocket connection requests. @@ -466,14 +474,6 @@ Exposes the methods and property for the WebSocket service host. - - - ResponseEventArgs - - - Contains the event data associated with the response events of the WebSocketSharp.Server.HttpServer class. - - WebSocketServer diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/HttpRequestEventArgs.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/HttpRequestEventArgs.xml new file mode 100644 index 00000000..d729435b --- /dev/null +++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/HttpRequestEventArgs.xml @@ -0,0 +1,57 @@ + + + + + websocket-sharp + + + System.EventArgs + + + +

+ Contains the event data associated with the HTTP request events of the class. + + + An HTTP request event occurs when a instance receives an HTTP request. + If you want to get the HTTP request objects, you should access the property. + If you want to get the HTTP response objects to send, you should access the property. + + + + + + + Property + + WebSocketSharp.Net.HttpListenerRequest + + + + Gets the HTTP request objects sent from a client. + + + A that contains the HTTP request objects. + + To be added. + + + + + + Property + + WebSocketSharp.Net.HttpListenerResponse + + + + Gets the HTTP response objects to send to the client in response to the client's request. + + + A that contains the HTTP response objects. + + To be added. + + + + diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/HttpServer.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/HttpServer.xml index 5cd450d7..5e10262f 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/HttpServer.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/HttpServer.xml @@ -10,7 +10,7 @@ - Provides the functions of a simple HTTP server that allows to accept the WebSocket connection requests. + Provides a simple HTTP server that allows to accept the WebSocket connection requests. @@ -125,6 +125,34 @@ To be added. + + + + Event + + System.EventHandler<WebSocketSharp.Server.HttpRequestEventArgs> + + + + Occurs when the server receives an HTTP CONNECT request. + + To be added. + + + + + + Event + + System.EventHandler<WebSocketSharp.Server.HttpRequestEventArgs> + + + + Occurs when the server receives an HTTP DELETE request. + + To be added. + + @@ -139,40 +167,12 @@ To be added. - - - + + + Event - System.EventHandler<WebSocketSharp.Server.ResponseEventArgs> - - - - Occurs when the server receives an HTTP CONNECT request. - - To be added. - - - - - - Event - - System.EventHandler<WebSocketSharp.Server.ResponseEventArgs> - - - - Occurs when the server receives an HTTP DELETE request. - - To be added. - - - - - - Event - - System.EventHandler<WebSocketSharp.Server.ResponseEventArgs> + System.EventHandler<WebSocketSharp.Server.HttpRequestEventArgs> @@ -181,12 +181,12 @@ To be added. - - - + + + Event - System.EventHandler<WebSocketSharp.Server.ResponseEventArgs> + System.EventHandler<WebSocketSharp.Server.HttpRequestEventArgs> @@ -195,12 +195,12 @@ To be added. - - - + + + Event - System.EventHandler<WebSocketSharp.Server.ResponseEventArgs> + System.EventHandler<WebSocketSharp.Server.HttpRequestEventArgs> @@ -209,12 +209,12 @@ To be added. - - - + + + Event - System.EventHandler<WebSocketSharp.Server.ResponseEventArgs> + System.EventHandler<WebSocketSharp.Server.HttpRequestEventArgs> @@ -223,12 +223,12 @@ To be added. - - - + + + Event - System.EventHandler<WebSocketSharp.Server.ResponseEventArgs> + System.EventHandler<WebSocketSharp.Server.HttpRequestEventArgs> @@ -237,12 +237,12 @@ To be added. - - - + + + Event - System.EventHandler<WebSocketSharp.Server.ResponseEventArgs> + System.EventHandler<WebSocketSharp.Server.HttpRequestEventArgs> @@ -251,12 +251,12 @@ To be added. - - - + + + Event - System.EventHandler<WebSocketSharp.Server.ResponseEventArgs> + System.EventHandler<WebSocketSharp.Server.HttpRequestEventArgs> @@ -309,7 +309,7 @@ - Starts to receive incoming requests. + Starts the . To be added. @@ -324,7 +324,7 @@ - Stops receiving incoming requests. + Shuts down the . To be added. diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/RequestEventArgs.xml.remove b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/RequestEventArgs.xml.remove new file mode 100644 index 00000000..c3af6eb8 --- /dev/null +++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/RequestEventArgs.xml.remove @@ -0,0 +1,57 @@ + + + + + websocket-sharp + + + System.EventArgs + + + + + Contains the event data associated with the request events of the class. + + + A request event occurs when a instance receives an HTTP request. + If you want to get the HTTP request objects, you should access the property. + If you want to get the HTTP response objects to send, you should access the property. + + + + + + + Property + + WebSocketSharp.Net.HttpListenerRequest + + + + Gets the HTTP request objects sent from a client. + + + A that contains the HTTP request objects. + + To be added. + + + + + + Property + + WebSocketSharp.Net.HttpListenerResponse + + + + Gets the HTTP response objects to send to the client in response to the client's request. + + + A that contains the HTTP response objects. + + To be added. + + + + diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/ResponseEventArgs.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/ResponseEventArgs.xml.remove similarity index 100% rename from websocket-sharp/doc/mdoc/WebSocketSharp.Server/ResponseEventArgs.xml rename to websocket-sharp/doc/mdoc/WebSocketSharp.Server/ResponseEventArgs.xml.remove diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml index 3bd86804..0a698f1b 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml @@ -548,6 +548,49 @@ To be added. + + + + Method + + System.Boolean + + + + + + + + A that contains an HTTP request information. + + + A that contains a protocol name. + + + Determines whether the specified is the HTTP Upgrade request + to switch to the specified . + + + true if the specified is the HTTP Upgrade request + to switch to the specified ; otherwise, false. + + To be added. + + + is . + + + -or- + + + is . + + + + is . + + + diff --git a/websocket-sharp/doc/mdoc/index.xml b/websocket-sharp/doc/mdoc/index.xml index 0bee7d1f..d805a609 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 ] @@ -67,9 +67,9 @@ + - @@ -650,6 +650,36 @@ + + + + + + + + ExtensionMethod + + System.Boolean + + + + + + + + A that contains an HTTP request information. + + + A that contains a protocol name. + + + Determines whether the specified is the HTTP Upgrade request + to switch to the specified . + + + + + diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj index 082f197d..e8db03fd 100644 --- a/websocket-sharp/websocket-sharp.csproj +++ b/websocket-sharp/websocket-sharp.csproj @@ -101,7 +101,6 @@ - @@ -120,6 +119,7 @@ + diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb index 7c3f3d2d..e8813a5a 100644 Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ