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

Added GetValue (this string, string, bool) method

Browse Source
This commit is contained in:
sta 2014-08-10 21:49:42 +09:00
parent 034e245272
commit aedefc1391
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
websocket-sharp/Ext.cs
View File

@ -508,6 +508,24 @@ namespace WebSocketSharp
: null;
}
internal static string GetValue (this string nameAndValue, string separator, bool unquote)
{
var i = nameAndValue.IndexOf (separator);
if (i < 0 || i == nameAndValue.Length - 1)
return null;
var val = nameAndValue.Substring (i + 1).Trim ();
var len = val.Length;
if (len > 0 && val[0] == '"' && unquote) {
var end = val.LastIndexOf ('"');
return end == 0
? len > 1 ? val.Substring (1) : String.Empty
: end > 1 ? val.Substring (1, end - 1) : String.Empty;
}
return val;
}
internal static TcpListenerWebSocketContext GetWebSocketContext (
this TcpClient client, string protocol, bool secure, X509Certificate cert, Logger logger)
{

4
websocket-sharp/Net/HttpListenerRequest.cs
View File

@ -522,10 +522,10 @@ namespace WebSocketSharp.Net
foreach (var p in parts) {
var part = p.Trim ();
if (part.StartsWith ("charset", StringComparison.OrdinalIgnoreCase)) {
var charset = part.GetValue ("=");
var charset = part.GetValue ("=", true);
if (charset != null && charset.Length > 0) {
try {
_contentEncoding = Encoding.GetEncoding (charset.Trim ('"'));
_contentEncoding = Encoding.GetEncoding (charset);
}
catch {
_context.ErrorMessage = "Invalid Content-Type header";