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

Refactored Ext.cs

Browse Source
This commit is contained in:
sta 2014-08-12 21:48:48 +09:00
parent decddde20a
commit 0a742f2e91
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
websocket-sharp/Ext.cs
View File

@ -615,9 +615,7 @@ namespace WebSocketSharp
internal static string Quote (this string value)
{
return value.IsToken ()
? value
: String.Format ("\"{0}\"", value.Replace ("\"", "\\\""));
return String.Format ("\"{0}\"", value.Replace ("\"", "\\\""));
}
internal static byte[] ReadBytes (this Stream stream, int length)
@ -834,12 +832,12 @@ namespace WebSocketSharp
/// A <see cref="string"/> that represents the WebSocket URL to try.
/// </param>
/// <param name="result">
/// When this method returns, a <see cref="Uri"/> that represents the WebSocket URL if
/// <paramref name="uriString"/> is valid; otherwise, <see langword="null"/>.
/// When this method returns, a <see cref="Uri"/> that represents the WebSocket URL
/// if <paramref name="uriString"/> is valid; otherwise, <see langword="null"/>.
/// </param>
/// <param name="message">
/// When this method returns, a <see cref="string"/> that represents the error message if
/// <paramref name="uriString"/> is invalid; otherwise, <see cref="String.Empty"/>.
/// When this method returns, a <see cref="string"/> that represents the error message
/// if <paramref name="uriString"/> is invalid; otherwise, <see cref="String.Empty"/>.
/// </param>
internal static bool TryCreateWebSocketUri (
this string uriString, out Uri result, out string message)
@ -880,9 +878,9 @@ namespace WebSocketSharp
}
}
else {
uri = String.Format (
"{0}://{1}:{2}{3}", schm, uri.Host, schm == "ws" ? 80 : 443, uri.PathAndQuery)
.ToUri ();
uri = new Uri (
String.Format (
"{0}://{1}:{2}{3}", schm, uri.Host, schm == "ws" ? 80 : 443, uri.PathAndQuery));
}
result = uri;

6
websocket-sharp/Net/Cookie.cs
View File

@ -667,8 +667,10 @@ namespace WebSocketSharp.Net
if (!_comment.IsNullOrEmpty ())
result.AppendFormat ("; Comment={0}", _comment.UrlEncode ());
if (_commentUri != null)
result.AppendFormat ("; CommentURL={0}", _commentUri.OriginalString.Quote ());
if (_commentUri != null) {
var url = _commentUri.OriginalString;
result.AppendFormat ("; CommentURL={0}", url.IsToken () ? url : url.Quote ());
}
if (_discard)
result.Append ("; Discard");