PowerShell
diff --git a/‎src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs‎
Lines changed: 18 additions & 15 deletions b/‎src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs‎
Lines changed: 18 additions & 15 deletions
diff --git a/‎test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1‎
Lines changed: 42 additions & 0 deletions b/‎test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1‎
Lines changed: 42 additions & 0 deletions
@@ -1241,26 +1241,29 @@ internal virtual void FillRequestStream(HttpRequestMessage request)
             }
 
             // Add the content headers
-            if (request.Content != null)
+            if (request.Content == null)
+            {   
+                request.Content = new StringContent(string.Empty);
+                request.Content.Headers.Clear();
+            }
+
+            foreach (var entry in WebSession.ContentHeaders)
             {
-                foreach (var entry in WebSession.ContentHeaders)
+                if (SkipHeaderValidation)
                 {
-                    if (SkipHeaderValidation)
+                    request.Content.Headers.TryAddWithoutValidation(entry.Key, entry.Value);
+                }
+                else
+                {
+                    try
                     {
-                        request.Content.Headers.TryAddWithoutValidation(entry.Key, entry.Value);
+                        request.Content.Headers.Add(entry.Key, entry.Value);
                     }
-                    else
+                    catch (FormatException ex)
                     {
-                        try
-                        {
-                            request.Content.Headers.Add(entry.Key, entry.Value);
-                        }
-                        catch (FormatException ex)
-                        {
-                            var outerEx = new ValidationMetadataException(WebCmdletStrings.ContentTypeException, ex);
-                            ErrorRecord er = new ErrorRecord(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
-                            ThrowTerminatingError(er);
-                        }
+                        var outerEx = new ValidationMetadataException(WebCmdletStrings.ContentTypeException, ex);
+                        ErrorRecord er = new ErrorRecord(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
+                        ThrowTerminatingError(er);
                     }
                 }
             }
 
@@ -993,6 +993,28 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
             $result.data | Should -Match 'bar'
             $result.headers.'Content-Type' | Should -BeExactly $contentType
         }
+
+        It "Verifies Invoke-WebRequest applies -ContentType when no -Body is present" {
+            $contentType = 'application/json'
+            $uri = Get-WebListenerUrl -Test 'Get'
+
+            $response = Invoke-WebRequest -Uri $uri -Method 'GET' -ContentType $contentType
+            $result = $response.Content | ConvertFrom-Json
+
+            $result.data | Should -BeNullOrEmpty
+            $result.headers.'Content-Type' | Should -BeExactly $contentType
+        }
+
+        It "Verifies Invoke-WebRequest applies an invalid -ContentType when no -Body is present and -SkipHeaderValidation is present" {
+            $contentType = 'foo'
+            $uri = Get-WebListenerUrl -Test 'Get'
+
+            $response = Invoke-WebRequest -Uri $uri -Method 'GET' -ContentType $contentType -SkipHeaderValidation
+            $result = $response.Content | ConvertFrom-Json
+
+            $result.data | Should -BeNullOrEmpty
+            $result.headers.'Content-Type' | Should -BeExactly $contentType
+        }
     }
 
     #region charset encoding tests
@@ -2388,6 +2410,26 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
             $result.data | Should -Match 'bar'
             $result.headers.'Content-Type' | Should -BeExactly $contentType
         }
+
+        It "Verifies Invoke-RestMethod applies -ContentType when no -Body is present" {
+            $contentType = 'application/json'
+            $uri = Get-WebListenerUrl -Test 'Get'
+
+            $result = Invoke-RestMethod -Uri $uri -Method 'GET' -ContentType $contentType
+
+            $result.data | Should -BeNullOrEmpty
+            $result.headers.'Content-Type' | Should -BeExactly $contentType
+        }
+
+        It "Verifies Invoke-RestMethod applies an invalid -ContentType when no -Body is present and -SkipHeaderValidation is present" {
+            $contentType = 'foo'
+            $uri = Get-WebListenerUrl -Test 'Get'
+
+            $result = Invoke-RestMethod -Uri $uri -Method 'GET' -ContentType $contentType -SkipHeaderValidation
+
+            $result.data | Should -BeNullOrEmpty
+            $result.headers.'Content-Type' | Should -BeExactly $contentType
+        }
     }
 
     Context "HTTPS Tests" {
Original file line number	Diff line number	Diff line change
@@ -1241,26 +1241,29 @@ internal virtual void FillRequestStream(HttpRequestMessage request)
1241	1241	}
1242	1242
1243	1243	// Add the content headers
1244		- if (request.Content != null)
	1244	+ if (request.Content == null)
	1245	+ {
	1246	+ request.Content = new StringContent(string.Empty);
	1247	+ request.Content.Headers.Clear();
	1248	+ }
	1249	+
	1250	+ foreach (var entry in WebSession.ContentHeaders)
1245	1251	{
1246		- foreach (var entry in WebSession.ContentHeaders)
	1252	+ if (SkipHeaderValidation)
1247	1253	{
1248		- if (SkipHeaderValidation)
	1254	+ request.Content.Headers.TryAddWithoutValidation(entry.Key, entry.Value);
	1255	+ }
	1256	+ else
	1257	+ {
	1258	+ try
1249	1259	{
1250		- request.Content.Headers.TryAddWithoutValidation(entry.Key, entry.Value);
	1260	+ request.Content.Headers.Add(entry.Key, entry.Value);
1251	1261	}
1252		- else
	1262	+ catch (FormatException ex)
1253	1263	{
1254		- try
1255		- {
1256		- request.Content.Headers.Add(entry.Key, entry.Value);
1257		- }
1258		- catch (FormatException ex)
1259		- {
1260		- var outerEx = new ValidationMetadataException(WebCmdletStrings.ContentTypeException, ex);
1261		- ErrorRecord er = new ErrorRecord(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
1262		- ThrowTerminatingError(er);
1263		- }
	1264	+ var outerEx = new ValidationMetadataException(WebCmdletStrings.ContentTypeException, ex);
	1265	+ ErrorRecord er = new ErrorRecord(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
	1266	+ ThrowTerminatingError(er);
1264	1267	}
1265	1268	}
1266	1269	}