huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to OnSendingHeaders rename.

This commit is contained in:
Chris R 2015-06-12 15:05:45 -07:00
parent 106edf8c86
commit 08c0bbbd60
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Kestrel/ServerRequest.cs
View File

@ -194,14 +194,14 @@ namespace Kestrel
} }
} }
bool IHttpResponseFeature.HeadersSent bool IHttpResponseFeature.HasStarted
{ {
get { return _frame.HeadersSent; } get { return _frame.HasResponseStarted; }
} }
void IHttpResponseFeature.OnSendingHeaders(Action<object> callback, object state) void IHttpResponseFeature.OnResponseStarting(Action<object> callback, object state)
{ {
_frame.OnSendingHeaders(callback, state); _frame.OnResponseStarting(callback, state);
} }
void IHttpResponseFeature.OnResponseCompleted(Action<object> callback, object state) void IHttpResponseFeature.OnResponseCompleted(Action<object> callback, object state)

38
src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
View File

@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
Mode _mode; Mode _mode;
private bool _resultStarted; private bool _resultStarted;
private bool _headersSent; private bool _responseStarted;
private bool _keepAlive; private bool _keepAlive;
/* /*
@ -63,9 +63,9 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
CancellationTokenSource _cts = new CancellationTokenSource(); CancellationTokenSource _cts = new CancellationTokenSource();
*/ */
List<KeyValuePair<Action<object>, object>> _onSendingHeaders; List<KeyValuePair<Action<object>, object>> _onResponseStarting;
List<KeyValuePair<Action<object>, object>> _onResponseCompleted; List<KeyValuePair<Action<object>, object>> _onResponseCompleted;
object _onSendingHeadersSync = new Object(); object _onResponseStartingSync = new Object();
object _onResponseCompletedSync = new Object(); object _onResponseCompletedSync = new Object();
public Frame(ConnectionContext context) : base(context) public Frame(ConnectionContext context) : base(context)
@ -92,9 +92,9 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
public Stream DuplexStream { get; set; } public Stream DuplexStream { get; set; }
public bool HeadersSent public bool HasResponseStarted
{ {
get { return _headersSent; } get { return _responseStarted; }
} }
@ -190,15 +190,15 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
Task.Run(ExecuteAsync); Task.Run(ExecuteAsync);
} }
public void OnSendingHeaders(Action<object> callback, object state) public void OnResponseStarting(Action<object> callback, object state)
{ {
lock (_onSendingHeadersSync) lock (_onResponseStartingSync)
{ {
if (_onSendingHeaders == null) if (_onResponseStarting == null)
{ {
_onSendingHeaders = new List<KeyValuePair<Action<object>, object>>(); _onResponseStarting = new List<KeyValuePair<Action<object>, object>>();
} }
_onSendingHeaders.Add(new KeyValuePair<Action<object>, object>(callback, state)); _onResponseStarting.Add(new KeyValuePair<Action<object>, object>(callback, state));
} }
} }
@ -214,17 +214,17 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
} }
} }
private void FireOnSendingHeaders() private void FireOnResponseStarting()
{ {
List<KeyValuePair<Action<object>, object>> onSendingHeaders = null; List<KeyValuePair<Action<object>, object>> onResponseStarting = null;
lock (_onSendingHeadersSync) lock (_onResponseStartingSync)
{ {
onSendingHeaders = _onSendingHeaders; onResponseStarting = _onResponseStarting;
_onSendingHeaders = null; _onResponseStarting = null;
} }
if (onSendingHeaders != null) if (onResponseStarting != null)
{ {
foreach (var entry in onSendingHeaders) foreach (var entry in onResponseStarting)
{ {
entry.Key.Invoke(entry.Value); entry.Key.Invoke(entry.Value);
} }
@ -318,9 +318,9 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
if (_resultStarted) return; if (_resultStarted) return;
_resultStarted = true; _resultStarted = true;
FireOnSendingHeaders(); FireOnResponseStarting();
_headersSent = true; _responseStarted = true;
var status = ReasonPhrases.ToStatus(StatusCode, ReasonPhrase); var status = ReasonPhrases.ToStatus(StatusCode, ReasonPhrase);