From 98ff22b12cb5ef08743ceb2660be9fc41260b5a3 Mon Sep 17 00:00:00 2001
From: Geoff Kizer <geoffrek>
Date: Mon, 19 Feb 2018 11:28:15 -0800
Subject: [PATCH] modify test to work around CL population issue

Commit migrated from https://github.com/dotnet/corefx/commit/ff5318905c9134d5fbf87b6597f72d331bc9a029
---
 .../tests/FunctionalTests/PostScenarioTest.cs                | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/PostScenarioTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/PostScenarioTest.cs
index 5c5ee93..446fab9 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/PostScenarioTest.cs
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/PostScenarioTest.cs
@@ -191,9 +191,17 @@ namespace System.Net.Http.Functional.Tests
         {
             using (HttpClient client = CreateHttpClient())
             {
-                if (!useContentLengthUpload && requestContent != null)
+                if (requestContent != null)
                 {
-                    requestContent.Headers.ContentLength = null;
+                    if (useContentLengthUpload)
+                    {
+                        // Ensure that Content-Length is populated (see issue #27245)
+                        requestContent.Headers.ContentLength = requestContent.Headers.ContentLength;
+                    }
+                    else
+                    {
+                        requestContent.Headers.ContentLength = null;
+                    }
                 }
                 
                 if (useChunkedEncodingUpload)
-- 
2.7.4