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

Change default for queryStringDelete (#21586)

This commit is contained in:
brianchance 2020-06-15 16:46:40 -05:00 committed by GitHub
parent 7cdbaeeccf
commit a0827ace5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Middleware/Rewrite/src/IISUrlRewrite/UrlRewriteFileParser.cs
View File

@ -219,7 +219,7 @@ namespace Microsoft.AspNetCore.Rewrite.IISUrlRewrite
else else
{ {
var redirectType = ParseEnum(urlAction, RewriteTags.RedirectType, RedirectType.Permanent); var redirectType = ParseEnum(urlAction, RewriteTags.RedirectType, RedirectType.Permanent);
action = new RedirectAction((int)redirectType, urlPattern, appendQuery); action = new RedirectAction((int)redirectType, urlPattern, appendQuery, !appendQuery, escapeBackReferences: false);
} }
break; break;
case ActionType.AbortRequest: case ActionType.AbortRequest:

14
src/Middleware/Rewrite/src/UrlActions/RedirectAction.cs
View File

@ -28,19 +28,6 @@ namespace Microsoft.AspNetCore.Rewrite.UrlActions
EscapeBackReferences = escapeBackReferences; EscapeBackReferences = escapeBackReferences;
} }
public RedirectAction(
int statusCode,
Pattern pattern,
bool queryStringAppend)
: this(
statusCode,
pattern,
queryStringAppend,
queryStringDelete: true,
escapeBackReferences: false)
{
}
public override void ApplyAction(RewriteContext context, BackReferenceCollection ruleBackReferences, BackReferenceCollection conditionBackReferences) public override void ApplyAction(RewriteContext context, BackReferenceCollection ruleBackReferences, BackReferenceCollection conditionBackReferences)
{ {
var pattern = Url.Evaluate(context, ruleBackReferences, conditionBackReferences); var pattern = Url.Evaluate(context, ruleBackReferences, conditionBackReferences);
@ -58,7 +45,6 @@ namespace Microsoft.AspNetCore.Rewrite.UrlActions
return; return;
} }
if (pattern.IndexOf("://", StringComparison.Ordinal) == -1 && pattern[0] != '/') if (pattern.IndexOf("://", StringComparison.Ordinal) == -1 && pattern[0] != '/')
{ {
pattern = '/' + pattern; pattern = '/' + pattern;

6
src/Middleware/Rewrite/test/IISUrlRewrite/MiddleWareTests.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;
@ -399,7 +399,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
var response = await server.CreateClient().GetAsync("article/23?p1=123&p2=abc"); var response = await server.CreateClient().GetAsync("article/23?p1=123&p2=abc");
Assert.Equal("/blogposts/article/abc", response.Headers.Location.OriginalString); Assert.Equal("/blogposts/article/abc?p1=123&p2=abc", response.Headers.Location.OriginalString);
} }
[Fact] [Fact]
@ -427,7 +427,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
var response = await server.CreateClient().GetAsync("article/23?p1=123&p2=abc"); var response = await server.CreateClient().GetAsync("article/23?p1=123&p2=abc");
Assert.Equal("/blog/article/23/abc", response.Headers.Location.OriginalString); Assert.Equal("/blog/article/23/abc?p1=123&p2=abc", response.Headers.Location.OriginalString);
} }
[Fact] [Fact]