huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to merge conflicts

This commit is contained in:
Chris R 2019-07-10 16:00:15 -07:00
parent 85cd3877a6
commit 8be8e65fcc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/RequestTests.cs
View File

@ -9,7 +9,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing.xunit; using Microsoft.AspNetCore.Testing.xunit;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
{ {
[Collection(IISTestSiteCollection.Name)] [Collection(IISTestSiteCollection.Name)]
public class RequestInProcessTests public class RequestInProcessTests

6
src/Shared/HttpSys/RequestProcessing/RequestUriBuilder.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.HttpSys.Internal
var length = PathNormalizer.RemoveDotSegments(unescapedPath); var length = PathNormalizer.RemoveDotSegments(unescapedPath);
return UTF8.GetString(unescapedPath.Array, unescapedPath.Offset, length); return UTF8.GetString(unescapedPath.Slice(0, length));
} }
/// <summary> /// <summary>
@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.HttpSys.Internal
/// </summary> /// </summary>
/// <param name="rawPath">The raw path string to be unescaped</param> /// <param name="rawPath">The raw path string to be unescaped</param>
/// <returns>The unescaped path string</returns> /// <returns>The unescaped path string</returns>
private static ReadOnlySpan<byte> Unescape(Span<byte> rawPath) private static Span<byte> Unescape(Span<byte> rawPath)
{ {
// the slot to read the input // the slot to read the input
var reader = 0; var reader = 0;