From a79b05bf2400809778b77440fbf683bd422a891c Mon Sep 17 00:00:00 2001 From: Chris R Date: Fri, 12 Jun 2015 12:59:07 -0700 Subject: [PATCH] #320 Rename OnSendingHeaders to OnResponseStarting and HeadersSent to HasStarted. --- src/Microsoft.AspNet.Http.Abstractions/HttpResponse.cs | 4 ++-- .../IHttpResponseFeature.cs | 4 ++-- src/Microsoft.AspNet.Http/DefaultHttpResponse.cs | 8 ++++---- src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs | 4 ++-- src/Microsoft.AspNet.Owin/OwinEnvironment.cs | 2 +- src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Microsoft.AspNet.Http.Abstractions/HttpResponse.cs b/src/Microsoft.AspNet.Http.Abstractions/HttpResponse.cs index a3317f873d..a0a92fb823 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/HttpResponse.cs +++ b/src/Microsoft.AspNet.Http.Abstractions/HttpResponse.cs @@ -22,9 +22,9 @@ namespace Microsoft.AspNet.Http public abstract IResponseCookies Cookies { get; } - public abstract bool HeadersSent { get; } + public abstract bool HasStarted { get; } - public abstract void OnSendingHeaders(Action callback, object state); + public abstract void OnResponseStarting(Action callback, object state); public abstract void OnResponseCompleted(Action callback, object state); diff --git a/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs index e93a9d1c03..9057a9991f 100644 --- a/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs +++ b/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs @@ -13,8 +13,8 @@ namespace Microsoft.AspNet.Http.Features string ReasonPhrase { get; set; } IDictionary Headers { get; set; } Stream Body { get; set; } - bool HeadersSent { get; } - void OnSendingHeaders(Action callback, object state); + bool HasStarted { get; } + void OnResponseStarting(Action callback, object state); void OnResponseCompleted(Action callback, object state); } } diff --git a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs index d264ff97a3..2f38ac9cbe 100644 --- a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs +++ b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs @@ -89,14 +89,14 @@ namespace Microsoft.AspNet.Http.Internal 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 callback, object state) + public override void OnResponseStarting(Action callback, object state) { - HttpResponseFeature.OnSendingHeaders(callback, state); + HttpResponseFeature.OnResponseStarting(callback, state); } public override void OnResponseCompleted(Action callback, object state) diff --git a/src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs b/src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs index 70b9128737..5e32a938be 100644 --- a/src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs +++ b/src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs @@ -24,12 +24,12 @@ namespace Microsoft.AspNet.Http.Features.Internal public Stream Body { get; set; } - public bool HeadersSent + public bool HasStarted { get { return false; } } - public void OnSendingHeaders(Action callback, object state) + public void OnResponseStarting(Action callback, object state) { throw new NotSupportedException(); } diff --git a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs index b96396f73a..0f5237ffbd 100644 --- a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs +++ b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs @@ -61,7 +61,7 @@ namespace Microsoft.AspNet.Owin { OwinConstants.ResponseReasonPhrase, new FeatureMap(feature => feature.ReasonPhrase, (feature, value) => feature.ReasonPhrase = Convert.ToString(value)) }, { OwinConstants.ResponseHeaders, new FeatureMap(feature => feature.Headers, (feature, value) => feature.Headers = (IDictionary)value) }, { OwinConstants.ResponseBody, new FeatureMap(feature => feature.Body, () => Stream.Null, (feature, value) => feature.Body = (Stream)value) }, - { OwinConstants.CommonKeys.OnSendingHeaders, new FeatureMap(feature => new Action, object>(feature.OnSendingHeaders)) }, + { OwinConstants.CommonKeys.OnSendingHeaders, new FeatureMap(feature => new Action, object>(feature.OnResponseStarting)) }, { OwinConstants.CommonKeys.LocalPort, new FeatureMap(feature => feature.LocalPort.ToString(CultureInfo.InvariantCulture), (feature, value) => feature.LocalPort = Convert.ToInt32(value, CultureInfo.InvariantCulture)) }, diff --git a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs index ec50c50928..c4030d9ed6 100644 --- a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs +++ b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs @@ -142,12 +142,12 @@ namespace Microsoft.AspNet.Owin set { Prop(OwinConstants.ResponseBody, value); } } - bool IHttpResponseFeature.HeadersSent + bool IHttpResponseFeature.HasStarted { get { return _headersSent; } } - void IHttpResponseFeature.OnSendingHeaders(Action callback, object state) + void IHttpResponseFeature.OnResponseStarting(Action callback, object state) { var register = Prop, object>>(OwinConstants.CommonKeys.OnSendingHeaders); if (register == null)