Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Wrapping a call to Registry so that Invoke-WebRequest does not fail on non-text responses #2811

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
mirichmo merged 3 commits into from
Dec 2, 2016
Merged

Wrapping a call to Registry so that Invoke-WebRequest does not fail on non-text responses #2811

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba5bdee
Wrapping a call to Registry in a #if !CORECLR
JonathanMalek Nov 30, 2016
4041f3a
Replacing check for CORECLR with a check for Platform.IsWindows.
JonathanMalek Dec 1, 2016
27506c3
And the required namespace
Dec 1, 2016
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
6 changes: 4 additions & 2 deletions 6 ...oft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
--********************************************************************/

using System;
using System.Management.Automation;
using System.Text;
using Microsoft.Win32;

Expand Down Expand Up @@ -87,7 +88,8 @@ private static bool CheckIsText(string contentType)
|| CheckIsXml(contentType)
|| CheckIsJson(contentType);

if (!isText)
// Further content type analysis is available on Windows
if (Platform.IsWindows && !isText)
{
// Media types registered with Windows as having a perceived type of text, are text
using (RegistryKey contentTypeKey = Registry.ClassesRoot.OpenSubKey(@"MIME\Database\Content Type\" + contentType))
Expand Down Expand Up @@ -135,7 +137,7 @@ private static bool CheckIsJson(string contentType)
// the correct type for JSON content, as specified in RFC 4627
bool isJson = contentType.Equals("application/json", StringComparison.OrdinalIgnoreCase);

// add in these other "javascript" related types that
// add in these other "javascript" related types that
// sometimes get sent down as the mime type for JSON content
isJson |= contentType.Equals("text/json", StringComparison.OrdinalIgnoreCase)
|| contentType.Equals("application/x-javascript", StringComparison.OrdinalIgnoreCase)
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.