Skip to content

#2308 In .NET 4.6.2, URLs do not execute Escape. #2327

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

Open
colindcli wants to merge 1 commit into
base: dev
Choose a base branch
from
+10 −2
Open

#2308 In .NET 4.6.2, URLs do not execute Escape. #2327

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
12 changes: 10 additions & 2 deletions src/RestSharp/Request/UriExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ public static Uri MergeBaseUrlAndResource(this Uri? baseUrl, string? resource) {

var usingBaseUri = baseUrl.AbsoluteUri[^1] == '/' || assembled.IsEmpty() ? baseUrl : new(baseUrl.AbsoluteUri + "/");

return assembled != null ? new(usingBaseUri, assembled) : baseUrl;
#if NETSTANDARD2_0
return !string.IsNullOrWhiteSpace(assembled) ? new(usingBaseUri, assembled, true) : baseUrl;
#else
return !string.IsNullOrWhiteSpace(assembled) ? new(usingBaseUri, assembled) : baseUrl;
#endif
}

public static Uri AddQueryString(this Uri uri, string? query) {
Expand All @@ -50,7 +54,11 @@ public static UrlSegmentParamsValues GetUrlSegmentParamsValues(
params ParametersCollection[] parametersCollections
) {
var assembled = baseUri == null ? "" : resource;
var baseUrl = baseUri ?? new Uri(resource);
#if NETSTANDARD2_0
var baseUrl = baseUri ?? new Uri(resource, true);
#else
var baseUrl = baseUri ?? new Uri(resource);
#endif

var hasResource = !assembled.IsEmpty();

Expand Down