Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Rename OnSendingHeaders to OnResponseStarting and HeadersSent toHasStarted. #328

Merged
merged 1 commit into from
Jun 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Microsoft.AspNet.Http.Abstractions/HttpResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ public abstract class HttpResponse

public abstract IResponseCookies Cookies { get; }

public abstract bool HeadersSent { get; }
public abstract bool HasStarted { get; }

public abstract void OnSendingHeaders(Action<object> callback, object state);
public abstract void OnResponseStarting(Action<object> callback, object state);

public abstract void OnResponseCompleted(Action<object> callback, object state);

Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public interface IHttpResponseFeature
string ReasonPhrase { get; set; }
IDictionary<string, string[]> Headers { get; set; }
Stream Body { get; set; }
bool HeadersSent { get; }
void OnSendingHeaders(Action<object> callback, object state);
bool HasStarted { get; }
void OnResponseStarting(Action<object> callback, object state);
void OnResponseCompleted(Action<object> callback, object state);
}
}
8 changes: 4 additions & 4 deletions src/Microsoft.AspNet.Http/DefaultHttpResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ public override IResponseCookies Cookies
get { return ResponseCookiesFeature.Cookies; }
}

public override bool HeadersSent
public override bool HasStarted
{
get { return HttpResponseFeature.HeadersSent; }
get { return HttpResponseFeature.HasStarted; }
}

public override void OnSendingHeaders(Action<object> callback, object state)
public override void OnResponseStarting(Action<object> callback, object state)
{
HttpResponseFeature.OnSendingHeaders(callback, state);
HttpResponseFeature.OnResponseStarting(callback, state);
}

public override void OnResponseCompleted(Action<object> callback, object state)
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ public HttpResponseFeature()

public Stream Body { get; set; }

public bool HeadersSent
public bool HasStarted
{
get { return false; }
}

public void OnSendingHeaders(Action<object> callback, object state)
public void OnResponseStarting(Action<object> callback, object state)
{
throw new NotSupportedException();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.AspNet.Owin/OwinEnvironment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public OwinEnvironment(HttpContext context)
{ OwinConstants.ResponseReasonPhrase, new FeatureMap<IHttpResponseFeature>(feature => feature.ReasonPhrase, (feature, value) => feature.ReasonPhrase = Convert.ToString(value)) },
{ OwinConstants.ResponseHeaders, new FeatureMap<IHttpResponseFeature>(feature => feature.Headers, (feature, value) => feature.Headers = (IDictionary<string, string[]>)value) },
{ OwinConstants.ResponseBody, new FeatureMap<IHttpResponseFeature>(feature => feature.Body, () => Stream.Null, (feature, value) => feature.Body = (Stream)value) },
{ OwinConstants.CommonKeys.OnSendingHeaders, new FeatureMap<IHttpResponseFeature>(feature => new Action<Action<object>, object>(feature.OnSendingHeaders)) },
{ OwinConstants.CommonKeys.OnSendingHeaders, new FeatureMap<IHttpResponseFeature>(feature => new Action<Action<object>, object>(feature.OnResponseStarting)) },

{ OwinConstants.CommonKeys.LocalPort, new FeatureMap<IHttpConnectionFeature>(feature => feature.LocalPort.ToString(CultureInfo.InvariantCulture),
(feature, value) => feature.LocalPort = Convert.ToInt32(value, CultureInfo.InvariantCulture)) },
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@ Stream IHttpResponseFeature.Body
set { Prop(OwinConstants.ResponseBody, value); }
}

bool IHttpResponseFeature.HeadersSent
bool IHttpResponseFeature.HasStarted
{
get { return _headersSent; }
}

void IHttpResponseFeature.OnSendingHeaders(Action<object> callback, object state)
void IHttpResponseFeature.OnResponseStarting(Action<object> callback, object state)
{
var register = Prop<Action<Action<object>, object>>(OwinConstants.CommonKeys.OnSendingHeaders);
if (register == null)
Expand Down