Fix due to the modified WebSocketContext.cs

This commit is contained in:
sta
2013-02-28 15:09:11 +09:00
parent 09c057efc2
commit c15ac02c9b
67 changed files with 113 additions and 19 deletions

View File

@@ -163,9 +163,9 @@ namespace WebSocketSharp.Net.WebSockets {
/// Gets the absolute path of the requested WebSocket URI.
/// </summary>
/// <value>
/// A <see cref="string"/> that contains the absolute path.
/// A <see cref="string"/> that contains the absolute path of the requested WebSocket URI.
/// </value>
public virtual string Path {
public override string Path {
get {
return RequestUri.GetAbsolutePath();
}

View File

@@ -174,9 +174,9 @@ namespace WebSocketSharp.Net.WebSockets {
/// Gets the absolute path of the requested WebSocket URI.
/// </summary>
/// <value>
/// A <see cref="string"/> that contains the absolute path.
/// A <see cref="string"/> that contains the absolute path of the requested WebSocket URI.
/// </value>
public virtual string Path {
public override string Path {
get {
return _request.RequestUri.GetAbsolutePath();
}

View File

@@ -110,6 +110,14 @@ namespace WebSocketSharp.Net.WebSockets {
/// </value>
public abstract string Origin { get; }
/// <summary>
/// Gets the absolute path of the requested WebSocket URI.
/// </summary>
/// <value>
/// A <see cref="string"/> that contains the absolute path of the requested WebSocket URI.
/// </value>
public abstract string Path { get; }
/// <summary>
/// Gets the collection of query string variables used in the WebSocket opening handshake.
/// </summary>

View File

@@ -555,9 +555,8 @@ namespace WebSocketSharp {
private void init(WebSocketContext context)
{
_context = context;
_uri = context.Path.ToUri();
_isSecure = context.IsSecureConnection;
_uri = "/".ToUri();
_isClient = false;
}

View File

@@ -3155,7 +3155,7 @@
Gets the absolute path of the requested WebSocket URI.
</summary>
<value>
A <see cref="T:System.String" /> that contains the absolute path.
A <see cref="T:System.String" /> that contains the absolute path of the requested WebSocket URI.
</value>
</member>
<member name="P:WebSocketSharp.Net.WebSockets.HttpListenerWebSocketContext.QueryString">
@@ -3313,7 +3313,7 @@
Gets the absolute path of the requested WebSocket URI.
</summary>
<value>
A <see cref="T:System.String" /> that contains the absolute path.
A <see cref="T:System.String" /> that contains the absolute path of the requested WebSocket URI.
</value>
</member>
<member name="P:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext.QueryString">
@@ -3469,6 +3469,14 @@
A <see cref="T:System.String" /> that contains the value of the Origin header field.
</value>
</member>
<member name="P:WebSocketSharp.Net.WebSockets.WebSocketContext.Path">
<summary>
Gets the absolute path of the requested WebSocket URI.
</summary>
<value>
A <see cref="T:System.String" /> that contains the absolute path of the requested WebSocket URI.
</value>
</member>
<member name="P:WebSocketSharp.Net.WebSockets.WebSocketContext.QueryString">
<summary>
Gets the collection of query string variables used in the WebSocket opening handshake.

View File

@@ -427,7 +427,7 @@
(<i>Inherited from <a href="../WebSocketSharp.Net.WebSockets/WebSocketContext.html">WebSocketContext</a>.</i>)</td>
</tr>
<tr valign="top">
<td>[read-only]<div></div></td>
<td>[read-only]<div>override </div></td>
<td>
<b>
<a href="#P:WebSocketSharp.Net.WebSockets.HttpListenerWebSocketContext.Path">Path</a>
@@ -439,6 +439,20 @@
</i>.
Gets the absolute path of the requested WebSocket URI.
</td>
</tr>
<tr valign="top">
<td>[read-only]<div>abstract </div></td>
<td>
<b>
<a href="../WebSocketSharp.Net.WebSockets/WebSocketContext.html#P:WebSocketSharp.Net.WebSockets.WebSocketContext.Path">Path</a>
</b>
</td>
<td>
<i>
<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>
</i>.
Gets the absolute path of the requested WebSocket URI.
(<i>Inherited from <a href="../WebSocketSharp.Net.WebSockets/WebSocketContext.html">WebSocketContext</a>.</i>)</td>
</tr>
<tr valign="top">
<td>[read-only]<div>override </div></td>
@@ -848,10 +862,10 @@
Gets the absolute path of the requested WebSocket URI.
</p>
<h2>Syntax</h2>
<div class="Signature">public virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>Path</b> { get; }</div>
<div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>Path</b> { get; }</div>
<h4 class="Subsection">Value</h4>
<blockquote class="SubsectionBox" id="P:WebSocketSharp.Net.WebSockets.HttpListenerWebSocketContext.Path:Value">
A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the absolute path.
A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the absolute path of the requested WebSocket URI.
</blockquote>
<h2 class="Section">Remarks</h2>
<div class="SectionBox" id="P:WebSocketSharp.Net.WebSockets.HttpListenerWebSocketContext.Path:Remarks">

View File

@@ -427,7 +427,7 @@
(<i>Inherited from <a href="../WebSocketSharp.Net.WebSockets/WebSocketContext.html">WebSocketContext</a>.</i>)</td>
</tr>
<tr valign="top">
<td>[read-only]<div></div></td>
<td>[read-only]<div>override </div></td>
<td>
<b>
<a href="#P:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext.Path">Path</a>
@@ -439,6 +439,20 @@
</i>.
Gets the absolute path of the requested WebSocket URI.
</td>
</tr>
<tr valign="top">
<td>[read-only]<div>abstract </div></td>
<td>
<b>
<a href="../WebSocketSharp.Net.WebSockets/WebSocketContext.html#P:WebSocketSharp.Net.WebSockets.WebSocketContext.Path">Path</a>
</b>
</td>
<td>
<i>
<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>
</i>.
Gets the absolute path of the requested WebSocket URI.
(<i>Inherited from <a href="../WebSocketSharp.Net.WebSockets/WebSocketContext.html">WebSocketContext</a>.</i>)</td>
</tr>
<tr valign="top">
<td>[read-only]<div>override </div></td>
@@ -899,10 +913,10 @@
Gets the absolute path of the requested WebSocket URI.
</p>
<h2>Syntax</h2>
<div class="Signature">public virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>Path</b> { get; }</div>
<div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>Path</b> { get; }</div>
<h4 class="Subsection">Value</h4>
<blockquote class="SubsectionBox" id="P:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext.Path:Value">
A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the absolute path.
A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the absolute path of the requested WebSocket URI.
</blockquote>
<h2 class="Section">Remarks</h2>
<div class="SectionBox" id="P:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext.Path:Remarks">

View File

@@ -349,6 +349,20 @@
<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>
</i>.
Gets the value of the Origin header field used in the WebSocket opening handshake.
</td>
</tr>
<tr valign="top">
<td>[read-only]<div>abstract </div></td>
<td>
<b>
<a href="#P:WebSocketSharp.Net.WebSockets.WebSocketContext.Path">Path</a>
</b>
</td>
<td>
<i>
<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>
</i>.
Gets the absolute path of the requested WebSocket URI.
</td>
</tr>
<tr valign="top">
@@ -643,6 +657,26 @@
<b>Namespace: </b>WebSocketSharp.Net.WebSockets<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
<hr size="1" />
</blockquote>
<h3 id="P:WebSocketSharp.Net.WebSockets.WebSocketContext.Path">Path Property</h3>
<blockquote id="P:WebSocketSharp.Net.WebSockets.WebSocketContext.Path:member">
<p class="Summary">
Gets the absolute path of the requested WebSocket URI.
</p>
<h2>Syntax</h2>
<div class="Signature">public abstract <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>Path</b> { get; }</div>
<h4 class="Subsection">Value</h4>
<blockquote class="SubsectionBox" id="P:WebSocketSharp.Net.WebSockets.WebSocketContext.Path:Value">
A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the absolute path of the requested WebSocket URI.
</blockquote>
<h2 class="Section">Remarks</h2>
<div class="SectionBox" id="P:WebSocketSharp.Net.WebSockets.WebSocketContext.Path:Remarks">
<span class="NotEntered">Documentation for this section has not yet been entered.</span>
</div>
<h2 class="Section">Requirements</h2>
<div class="SectionBox" id="P:WebSocketSharp.Net.WebSockets.WebSocketContext.Path:Version Information">
<b>Namespace: </b>WebSocketSharp.Net.WebSockets<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
<hr size="1" />
</blockquote>
<h3 id="P:WebSocketSharp.Net.WebSockets.WebSocketContext.QueryString">QueryString Property</h3>
<blockquote id="P:WebSocketSharp.Net.WebSockets.WebSocketContext.QueryString:member">
<p class="Summary">

View File

@@ -135,7 +135,7 @@
</Docs>
</Member>
<Member MemberName="Path">
<MemberSignature Language="C#" Value="public virtual string Path { get; }" />
<MemberSignature Language="C#" Value="public override string Path { get; }" />
<MemberSignature Language="ILAsm" Value=".property instance string Path" />
<MemberType>Property</MemberType>
<ReturnValue>
@@ -146,7 +146,7 @@
Gets the absolute path of the requested WebSocket URI.
</summary>
<value>
A <see cref="T:System.String" /> that contains the absolute path.
A <see cref="T:System.String" /> that contains the absolute path of the requested WebSocket URI.
</value>
<remarks>To be added.</remarks>
</Docs>

View File

@@ -144,7 +144,7 @@
</Docs>
</Member>
<Member MemberName="Path">
<MemberSignature Language="C#" Value="public virtual string Path { get; }" />
<MemberSignature Language="C#" Value="public override string Path { get; }" />
<MemberSignature Language="ILAsm" Value=".property instance string Path" />
<MemberType>Property</MemberType>
<ReturnValue>
@@ -155,7 +155,7 @@
Gets the absolute path of the requested WebSocket URI.
</summary>
<value>
A <see cref="T:System.String" /> that contains the absolute path.
A <see cref="T:System.String" /> that contains the absolute path of the requested WebSocket URI.
</value>
<remarks>To be added.</remarks>
</Docs>

View File

@@ -148,6 +148,23 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Path">
<MemberSignature Language="C#" Value="public abstract string Path { get; }" />
<MemberSignature Language="ILAsm" Value=".property instance string Path" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Docs>
<summary>
Gets the absolute path of the requested WebSocket URI.
</summary>
<value>
A <see cref="T:System.String" /> that contains the absolute path of the requested WebSocket URI.
</value>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="QueryString">
<MemberSignature Language="C#" Value="public abstract System.Collections.Specialized.NameValueCollection QueryString { get; }" />
<MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Specialized.NameValueCollection QueryString" />

View File

@@ -1,6 +1,6 @@
<Overview>
<Assemblies>
<Assembly Name="websocket-sharp" Version="1.0.2.25860">
<Assembly Name="websocket-sharp" Version="1.0.2.27191">
<AssemblyPublicKey>[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 ]</AssemblyPublicKey>
<Attributes>
<Attribute>

Binary file not shown.