.IndexOf(...) >= 0 to .Contains(...) (#4688)

benaadams · JamesNK · commit b2731d652d55 · 2018-12-14T12:40:09.000+13:00
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs
@@ -394,7 +394,7 @@ private unsafe void TakeSingleHeader(byte* headerLine, int length, TRequestHandl
 
             // Check for CR in value
             var valueBuffer = new Span<byte>(headerLine + valueStart, valueEnd - valueStart + 1);
-            if (valueBuffer.IndexOf(ByteCR) >= 0)
+            if (valueBuffer.Contains(ByteCR))
             {
                 RejectRequestHeader(headerLine, length);
             }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs
@@ -290,7 +290,7 @@ private bool TryValidatePath(ReadOnlySpan<char> pathSegment)
                 return false;
             }
 
-            var pathEncoded = pathSegment.IndexOf('%') >= 0;
+            var pathEncoded = pathSegment.Contains('%');
 
             // Compare with Http1Connection.OnOriginFormTarget
 

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ private unsafe void TakeSingleHeader(byte* headerLine, int length, TRequestHandl`
`394`	`394`
`395`	`395`	`// Check for CR in value`
`396`	`396`	`var valueBuffer = new Span<byte>(headerLine + valueStart, valueEnd - valueStart + 1);`
`397`		`- if (valueBuffer.IndexOf(ByteCR) >= 0)`
	`397`	`+ if (valueBuffer.Contains(ByteCR))`
`398`	`398`	`{`
`399`	`399`	`RejectRequestHeader(headerLine, length);`
`400`	`400`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ private bool TryValidatePath(ReadOnlySpan<char> pathSegment)`
`290`	`290`	`return false;`
`291`	`291`	`}`
`292`	`292`
`293`		`- var pathEncoded = pathSegment.IndexOf('%') >= 0;`
	`293`	`+ var pathEncoded = pathSegment.Contains('%');`
`294`	`294`
`295`	`295`	`// Compare with Http1Connection.OnOriginFormTarget`
`296`	`296`