[Fixes #1331] Dispose HttpResponseMessage once its written out in HttpResponseMessageOutputFormatter

Author: kichalla

src/Microsoft.AspNet.Mvc.WebApiCompatShim/Formatters/HttpResponseMessageOutputFormatter.cs

@@ -40,29 +40,32 @@ public async Task WriteAsync(OutputFormatterContext context)
                 throw new InvalidOperationException(message);
             }
 
-            response.StatusCode = (int)responseMessage.StatusCode;
-
-            var responseFeature = context.ActionContext.HttpContext.GetFeature<IHttpResponseFeature>();
-            if (responseFeature != null)
+            using (responseMessage)
             {
-                responseFeature.ReasonPhrase = responseMessage.ReasonPhrase;
-            }
+                response.StatusCode = (int)responseMessage.StatusCode;
 
-            var responseHeaders = responseMessage.Headers;
-            foreach (var header in responseHeaders)
-            {
-                response.Headers.AppendValues(header.Key, header.Value.ToArray());
-            }
+                var responseFeature = context.ActionContext.HttpContext.GetFeature<IHttpResponseFeature>();
+                if (responseFeature != null)
+                {
+                    responseFeature.ReasonPhrase = responseMessage.ReasonPhrase;
+                }
 
-            if (responseMessage.Content != null)
-            {
-                var contentHeaders = responseMessage.Content.Headers;
-                foreach (var header in contentHeaders)
+                var responseHeaders = responseMessage.Headers;
+                foreach (var header in responseHeaders)
                 {
                     response.Headers.AppendValues(header.Key, header.Value.ToArray());
                 }
 
-                await responseMessage.Content.CopyToAsync(response.Body);
+                if (responseMessage.Content != null)
+                {
+                    var contentHeaders = responseMessage.Content.Headers;
+                    foreach (var header in contentHeaders)
+                    {
+                        response.Headers.AppendValues(header.Key, header.Value.ToArray());
+                    }
+
+                    await responseMessage.Content.CopyToAsync(response.Body);
+                }
             }
         }
     }

test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs

@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.WebApiCompatShim;
+using Moq;
+using Moq.Protected;
+using Xunit;
+
+namespace Microsoft.AspNet.Mvc.WebApiCompatShimTest
+{
+    public class HttpResponseMessageOutputFormatterTests
+    {
+        [Fact]
+        public async Task Disposed_CalledOn_HttpResponseMessage()
+        {
+            // Arrange
+            var formatter = new HttpResponseMessageOutputFormatter();
+            var streamContent = new Mock<StreamContent>(new MemoryStream());
+            streamContent.Protected().Setup("Dispose", true).Verifiable();
+            var httpResponseMessage = new HttpResponseMessage();
+            httpResponseMessage.Content = streamContent.Object;
+            var outputFormatterContext = GetOutputFormatterContext(httpResponseMessage, typeof(HttpResponseMessage));
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            streamContent.Protected().Verify("Dispose", Times.Once(), true);
+        }
+
+        private OutputFormatterContext GetOutputFormatterContext(object outputValue, Type outputType)
+        {
+            return new OutputFormatterContext
+            {
+                Object = outputValue,
+                DeclaredType = outputType,
+                ActionContext = GetActionContext()
+            };
+        }
+
+        private static ActionContext GetActionContext()
+        {
+            var request = new Mock<HttpRequest>();
+            var response = new Mock<HttpResponse>();
+            response.SetupGet(f => f.Body).Returns(new MemoryStream());
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            httpContext.SetupGet(c => c.Response).Returns(response.Object);
+            return new ActionContext(httpContext.Object, routeData: null, actionDescriptor: null);
+        }
+    }
+}