From fa3b98f1137e7f8f66b8fecaa96078ac1fa996bf Mon Sep 17 00:00:00 2001 From: Chris R Date: Fri, 12 Jun 2015 15:28:54 -0700 Subject: [PATCH] React to OnSendingHeaders rename. --- .../FeatureContext.cs | 8 ++++---- .../RequestProcessing/Response.cs | 12 ++++++------ .../ResponseHeaderTests.cs | 8 ++++---- .../ResponseTests.cs | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs index 0d57f9c9ab..0994bde446 100644 --- a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs +++ b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs @@ -79,7 +79,7 @@ namespace Microsoft.AspNet.Server.WebListener _features = new FeatureCollection(); _authHandler = new AuthenticationHandler(requestContext); _enableResponseCaching = enableResponseCaching; - requestContext.Response.OnSendingHeaders(OnStartDelegate, this); + requestContext.Response.OnResponseStarting(OnStartDelegate, this); PopulateFeatures(); } @@ -372,14 +372,14 @@ namespace Microsoft.AspNet.Server.WebListener set { _responseHeaders = value; } } - bool IHttpResponseFeature.HeadersSent + bool IHttpResponseFeature.HasStarted { get { return Response.HasStarted; } } - void IHttpResponseFeature.OnSendingHeaders(Action callback, object state) + void IHttpResponseFeature.OnResponseStarting(Action callback, object state) { - Response.OnSendingHeaders(callback, state); + Response.OnResponseStarting(callback, state); } void IHttpResponseFeature.OnResponseCompleted(Action callback, object state) diff --git a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs index 18da46bcbe..18e44a4cd2 100644 --- a/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs +++ b/src/Microsoft.Net.Http.Server/RequestProcessing/Response.cs @@ -48,7 +48,7 @@ namespace Microsoft.Net.Http.Server private long _expectedBodyLength; private BoundaryType _boundaryType; private HttpApi.HTTP_RESPONSE_V2 _nativeResponse; - private IList, object>> _onSendingHeadersActions; + private IList, object>> _onResponseStartingActions; private IList, object>> _onResponseCompletedActions; private RequestContext _requestContext; @@ -80,7 +80,7 @@ namespace Microsoft.Net.Http.Server _nativeResponse.Response_V1.Version.MajorVersion = 1; _nativeResponse.Response_V1.Version.MinorVersion = 1; _responseState = ResponseState.Created; - _onSendingHeadersActions = new List, object>>(); + _onResponseStartingActions = new List, object>>(); _onResponseCompletedActions = new List, object>>(); _bufferingEnabled = _requestContext.Server.BufferResponses; _expectedBodyLength = 0; @@ -778,12 +778,12 @@ namespace Microsoft.Net.Http.Server _nativeStream.SwitchToOpaqueMode(); } - public void OnSendingHeaders(Action callback, object state) + public void OnResponseStarting(Action callback, object state) { - IList, object>> actions = _onSendingHeadersActions; + IList, object>> actions = _onResponseStartingActions; if (actions == null) { - throw new InvalidOperationException("Headers already sent"); + throw new InvalidOperationException("Response already started"); } actions.Add(new Tuple, object>(callback, state)); @@ -802,7 +802,7 @@ namespace Microsoft.Net.Http.Server private void NotifyOnSendingHeaders() { - var actions = Interlocked.Exchange(ref _onSendingHeadersActions, null); + var actions = Interlocked.Exchange(ref _onResponseStartingActions, null); if (actions == null) { // Something threw the first time, do not try again. diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs index 5d7cc5234a..cbf7e8ca3f 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs @@ -216,9 +216,9 @@ namespace Microsoft.AspNet.Server.WebListener responseHeaders.Add("Custom1", new string[] { "value1a", "value1b" }); responseHeaders.Add("Custom2", new string[] { "value2a, value2b" }); var body = responseInfo.Body; - Assert.False(responseInfo.HeadersSent); + Assert.False(responseInfo.HasStarted); body.Flush(); - Assert.True(responseInfo.HeadersSent); + Assert.True(responseInfo.HasStarted); Assert.Throws(() => responseInfo.StatusCode = 404); Assert.Throws(() => responseHeaders.Add("Custom3", new string[] { "value3a, value3b", "value3c" })); return Task.FromResult(0); @@ -248,9 +248,9 @@ namespace Microsoft.AspNet.Server.WebListener responseHeaders.Add("Custom1", new string[] { "value1a", "value1b" }); responseHeaders.Add("Custom2", new string[] { "value2a, value2b" }); var body = responseInfo.Body; - Assert.False(responseInfo.HeadersSent); + Assert.False(responseInfo.HasStarted); await body.FlushAsync(); - Assert.True(responseInfo.HeadersSent); + Assert.True(responseInfo.HasStarted); Assert.Throws(() => responseInfo.StatusCode = 404); Assert.Throws(() => responseHeaders.Add("Custom3", new string[] { "value3a, value3b", "value3c" })); })) diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs index eaafe14c21..9767fe11bf 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNet.Server.WebListener { var httpContext = new DefaultHttpContext((IFeatureCollection)env); Assert.Equal(200, httpContext.Response.StatusCode); - Assert.False(httpContext.Response.HeadersSent); + Assert.False(httpContext.Response.HasStarted); return Task.FromResult(0); })) {