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

Refactored a few for HttpListenerResponse.cs

Browse Source
This commit is contained in:
sta 2015-06-17 21:33:59 +09:00
parent 0c610dd41f
commit 9c4482e770
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
websocket-sharp/Net/HttpListenerResponse.cs
View File

@ -372,8 +372,8 @@ namespace WebSocketSharp.Net
/// Gets or sets the HTTP status code returned to the client. /// Gets or sets the HTTP status code returned to the client.
/// </summary> /// </summary>
/// <value> /// <value>
/// An <see cref="int"/> that represents the status code for the response to the request. /// An <see cref="int"/> that represents the status code for the response to
/// The default value is <see cref="HttpStatusCode.OK"/>. /// the request. The default value is same as <see cref="HttpStatusCode.OK"/>.
/// </value> /// </value>
/// <exception cref="InvalidOperationException"> /// <exception cref="InvalidOperationException">
/// The response has already been sent. /// The response has already been sent.
@ -382,7 +382,8 @@ namespace WebSocketSharp.Net
/// This object is closed. /// This object is closed.
/// </exception> /// </exception>
/// <exception cref="System.Net.ProtocolViolationException"> /// <exception cref="System.Net.ProtocolViolationException">
/// The value specified for a set operation is invalid. Valid values are between 100 and 999. /// The value specified for a set operation is invalid. Valid values are
/// between 100 and 999 inclusive.
/// </exception> /// </exception>
public int StatusCode { public int StatusCode {
get { get {
@ -392,7 +393,8 @@ namespace WebSocketSharp.Net
set { set {
checkDisposedOrHeadersSent (); checkDisposedOrHeadersSent ();
if (value < 100 || value > 999) if (value < 100 || value > 999)
throw new System.Net.ProtocolViolationException ("A value isn't between 100 and 999."); throw new System.Net.ProtocolViolationException (
"A value isn't between 100 and 999 inclusive.");
_statusCode = value; _statusCode = value;
_statusDescription = value.GetStatusDescription (); _statusDescription = value.GetStatusDescription ();
@ -403,10 +405,13 @@ namespace WebSocketSharp.Net
/// Gets or sets the description of the HTTP status code returned to the client. /// Gets or sets the description of the HTTP status code returned to the client.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="string"/> that represents the description of the status code. /// A <see cref="string"/> that represents the description of the status code. The default
/// value is the <see href="http://tools.ietf.org/html/rfc2616#section-10">RFC 2616</see>
/// description for the <see cref="HttpListenerResponse.StatusCode"/> property value,
/// or <see cref="String.Empty"/> if an RFC 2616 description doesn't exist.
/// </value> /// </value>
/// <exception cref="ArgumentNullException"> /// <exception cref="ArgumentException">
/// The value specified for a set operation is <see langword="null"/>. /// The value specified for a set operation contains invalid characters.
/// </exception> /// </exception>
/// <exception cref="InvalidOperationException"> /// <exception cref="InvalidOperationException">
/// The response has already been sent. /// The response has already been sent.
@ -421,12 +426,15 @@ namespace WebSocketSharp.Net
set { set {
checkDisposedOrHeadersSent (); checkDisposedOrHeadersSent ();
if (value == null) if (value == null || value.Length == 0) {
throw new ArgumentNullException ("value"); _statusDescription = _statusCode.GetStatusDescription ();
return;
}
_statusDescription = value.Length > 0 if (!value.IsText () || value.IndexOfAny (new[] { '\r', '\n' }) > -1)
? value throw new ArgumentException ("Contains invalid characters.", "value");
: _statusCode.GetStatusDescription ();
_statusDescription = value;
} }
} }