Skip to content

Revert "Adjust PUT method behavior to POST one for default content type in WebCmdlets" #21049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 1 commit into from
Feb 26, 2024
Merged

Revert "Adjust PUT method behavior to POST one for default content type in WebCmdlets" #21049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...owerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ internal virtual void FillRequestStream(HttpRequestMessage request)
{
WebSession.ContentHeaders[HttpKnownHeaderNames.ContentType] = ContentType;
}
else if (request.Method == HttpMethod.Post || request.Method == HttpMethod.Put)
else if (request.Method == HttpMethod.Post)
{
// Win8:545310 Invoke-WebRequest does not properly set MIME type for POST
WebSession.ContentHeaders.TryGetValue(HttpKnownHeaderNames.ContentType, out string contentType);
Expand Down
21 changes: 6 additions & 15 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,14 +795,9 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
($result.Output.Content | ConvertFrom-Json).method | Should -Be "TEST"
}

It "Validate Invoke-WebRequest default ContentType for CustomMethod <method>" -TestCases @(
@{method = "POST"}
@{method = "PUT"}
) {
param($method)

$uri = Get-WebListenerUrl -Test $method
$command = "Invoke-WebRequest -Uri '$uri' -CustomMethod $method -Body 'testparam=testvalue'"
It "Validate Invoke-WebRequest default ContentType for CustomMethod POST" {
$uri = Get-WebListenerUrl -Test 'Post'
$command = "Invoke-WebRequest -Uri '$uri' -CustomMethod POST -Body 'testparam=testvalue'"
$result = ExecuteWebCommand -command $command
$jsonResult = $result.Output.Content | ConvertFrom-Json
$jsonResult.form.testparam | Should -Be "testvalue"
Expand Down Expand Up @@ -2845,13 +2840,9 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
$result.Output.method | Should -Be "TEST"
}

It "Validate Invoke-RestMethod default ContentType for CustomMethod <method>" -TestCases @(
@{method = "POST"}
@{method = "PUT"}
) {
param($method)
$uri = Get-WebListenerUrl -Test $method
$command = "Invoke-RestMethod -Uri '$uri' -CustomMethod $method -Body 'testparam=testvalue'"
It "Validate Invoke-RestMethod default ContentType for CustomMethod POST" {
$uri = Get-WebListenerUrl -Test 'Post'
$command = "Invoke-RestMethod -Uri '$uri' -CustomMethod POST -Body 'testparam=testvalue'"
$result = ExecuteWebCommand -command $command
$result.Output.form.testparam | Should -Be "testvalue"
$result.Output.Headers.'Content-Type' | Should -Be "application/x-www-form-urlencoded"
Expand Down