[Modify] Polish it

This commit is contained in:
sta 2018-11-02 20:05:40 +09:00
parent 3a8d1d97c2
commit bbc0bd486c

View File

@ -650,40 +650,42 @@ namespace WebSocketSharp.Net
private string toResponseStringVersion1 () private string toResponseStringVersion1 ()
{ {
var output = new StringBuilder (64); var buff = new StringBuilder (64);
output.AppendFormat ("{0}={1}; Version={2}", _name, _value, _version);
buff.AppendFormat ("{0}={1}; Version={2}", _name, _value, _version);
if (_expires != DateTime.MinValue) if (_expires != DateTime.MinValue)
output.AppendFormat ("; Max-Age={0}", MaxAge); buff.AppendFormat ("; Max-Age={0}", MaxAge);
if (!_path.IsNullOrEmpty ()) if (!_path.IsNullOrEmpty ())
output.AppendFormat ("; Path={0}", _path); buff.AppendFormat ("; Path={0}", _path);
if (!_domain.IsNullOrEmpty ()) if (!_domain.IsNullOrEmpty ())
output.AppendFormat ("; Domain={0}", _domain); buff.AppendFormat ("; Domain={0}", _domain);
if (!_port.IsNullOrEmpty ()) { if (!_port.IsNullOrEmpty ()) {
if (_port == "\"\"") buff.Append (
output.Append ("; Port"); _port != "\"\"" ? String.Format ("; Port={0}", _port) : "; Port"
else );
output.AppendFormat ("; Port={0}", _port);
} }
if (!_comment.IsNullOrEmpty ()) if (!_comment.IsNullOrEmpty ())
output.AppendFormat ("; Comment={0}", HttpUtility.UrlEncode (_comment)); buff.AppendFormat ("; Comment={0}", HttpUtility.UrlEncode (_comment));
if (_commentUri != null) { if (_commentUri != null) {
var url = _commentUri.OriginalString; var url = _commentUri.OriginalString;
output.AppendFormat ("; CommentURL={0}", url.IsToken () ? url : url.Quote ()); buff.AppendFormat (
"; CommentURL={0}", !url.IsToken () ? url.Quote () : url
);
} }
if (_discard) if (_discard)
output.Append ("; Discard"); buff.Append ("; Discard");
if (_secure) if (_secure)
output.Append ("; Secure"); buff.Append ("; Secure");
return output.ToString (); return buff.ToString ();
} }
private static bool tryCreatePorts (string value, out int[] result, out string parseError) private static bool tryCreatePorts (string value, out int[] result, out string parseError)