Skip to content

UriHelper use Ordinal string.IndexOf #9537

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
merged 2 commits into from
Apr 19, 2019
Merged

UriHelper use Ordinal string.IndexOf #9537

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4324b13
UriHelper use Ordinal string.IndexOf
benaadams Apr 19, 2019
f0a3a71
Hashtag it up
benaadams Apr 19, 2019
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
13 changes: 6 additions & 7 deletions src/Http/Http.Extensions/src/UriHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ namespace Microsoft.AspNetCore.Http.Extensions
/// </summary>
public static class UriHelper
{
private const string ForwardSlash = "/";
private const string Pound = "#";
private const string QuestionMark = "?";
private const char ForwardSlash = '/';
private const char Hash = '#';
private const char QuestionMark = '?';
private const string SchemeDelimiter = "://";

/// <summary>
Expand Down Expand Up @@ -103,7 +103,7 @@ public static void FromAbsolute(
path = new PathString();
query = new QueryString();
fragment = new FragmentString();
var startIndex = uri.IndexOf(SchemeDelimiter);
var startIndex = uri.IndexOf(SchemeDelimiter, StringComparison.Ordinal);

if (startIndex < 0)
{
Expand All @@ -115,10 +115,9 @@ public static void FromAbsolute(
// PERF: Calculate the end of the scheme for next IndexOf
startIndex += SchemeDelimiter.Length;

var searchIndex = -1;
int searchIndex;
var limit = uri.Length;

if ((searchIndex = uri.IndexOf(Pound, startIndex)) >= 0 && searchIndex < limit)
if ((searchIndex = uri.IndexOf(Hash, startIndex)) >= 0 && searchIndex < limit)
{
fragment = FragmentString.FromUriComponent(uri.Substring(searchIndex));
limit = searchIndex;
Expand Down