Add TrailingHeaders to HttpResponseMessage.ToString output (dotnet/corefx#39902)

Commit migrated from https://github.com/dotnet/corefx/commit/a7c542f257f58e7ae41d5274a02a5e823d4492c0

diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/HttpResponseMessage.cs b/src/libraries/System.Net.Http/src/System/Net/Http/HttpResponseMessage.cs
index 7c56550..812d418 100644 (file)
--- a/src/libraries/System.Net.Http/src/System/Net/Http/HttpResponseMessage.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/HttpResponseMessage.cs
@@ -198,6 +198,12 @@ namespace System.Net.Http
             sb.Append(", Headers:\r\n");
             HeaderUtilities.DumpHeaders(sb, _headers, _content?.Headers);
 
+            if (_trailingHeaders != null)
+            {
+                sb.Append(", Trailing Headers:\r\n");
+                HeaderUtilities.DumpHeaders(sb, _trailingHeaders);
+            }
+
             return sb.ToString();
         }
 

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpResponseMessageTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpResponseMessageTest.cs
index 7676698..721932a 100644 (file)
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpResponseMessageTest.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpResponseMessageTest.cs
@@ -281,6 +281,21 @@ namespace System.Net.Http.Functional.Tests
                     "  Content-Type: text/plain; charset=utf-8\r\n" +
                     "  Custom-Content-Header: value2\r\n" +
                     "}", rm.ToString());
+
+                rm.TrailingHeaders.Add("Custom-Trailing-Header", "value3");
+
+                Assert.Equal(
+                    "StatusCode: 400, ReasonPhrase: 'Bad Request', Version: 1.0, Content: " + typeof(StringContent).ToString() + ", Headers:\r\n" +
+                    "{\r\n" +
+                    "  Accept-Ranges: bytes\r\n" +
+                    "  Accept-Ranges: pages\r\n" +
+                    "  Custom-Response-Header: value1\r\n" +
+                    "  Content-Type: text/plain; charset=utf-8\r\n" +
+                    "  Custom-Content-Header: value2\r\n" +
+                    "}, Trailing Headers:\r\n" +
+                    "{\r\n" +
+                    "  Custom-Trailing-Header: value3\r\n" +
+                    "}", rm.ToString());
             }
         }