Skip to content

Commit a0827ac

Browse files
authored
Change default for queryStringDelete (#21586)
1 parent 7cdbaee commit a0827ac

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

src/Middleware/Rewrite/src/IISUrlRewrite/UrlRewriteFileParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private void ParseUrlAction(XElement urlAction, UrlRewriteRuleBuilder builder, b
219219
else
220220
{
221221
var redirectType = ParseEnum(urlAction, RewriteTags.RedirectType, RedirectType.Permanent);
222-
action = new RedirectAction((int)redirectType, urlPattern, appendQuery);
222+
action = new RedirectAction((int)redirectType, urlPattern, appendQuery, !appendQuery, escapeBackReferences: false);
223223
}
224224
break;
225225
case ActionType.AbortRequest:

src/Middleware/Rewrite/src/UrlActions/RedirectAction.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,6 @@ public RedirectAction(
2828
EscapeBackReferences = escapeBackReferences;
2929
}
3030

31-
public RedirectAction(
32-
int statusCode,
33-
Pattern pattern,
34-
bool queryStringAppend)
35-
: this(
36-
statusCode,
37-
pattern,
38-
queryStringAppend,
39-
queryStringDelete: true,
40-
escapeBackReferences: false)
41-
{
42-
}
43-
4431
public override void ApplyAction(RewriteContext context, BackReferenceCollection ruleBackReferences, BackReferenceCollection conditionBackReferences)
4532
{
4633
var pattern = Url.Evaluate(context, ruleBackReferences, conditionBackReferences);
@@ -58,7 +45,6 @@ public override void ApplyAction(RewriteContext context, BackReferenceCollection
5845
return;
5946
}
6047

61-
6248
if (pattern.IndexOf("://", StringComparison.Ordinal) == -1 && pattern[0] != '/')
6349
{
6450
pattern = '/' + pattern;

src/Middleware/Rewrite/test/IISUrlRewrite/MiddleWareTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -399,7 +399,7 @@ public async Task VerifyTrackAllCaptures()
399399

400400
var response = await server.CreateClient().GetAsync("article/23?p1=123&p2=abc");
401401

402-
Assert.Equal("/blogposts/article/abc", response.Headers.Location.OriginalString);
402+
Assert.Equal("/blogposts/article/abc?p1=123&p2=abc", response.Headers.Location.OriginalString);
403403
}
404404

405405
[Fact]
@@ -427,7 +427,7 @@ public async Task VerifyTrackAllCapturesRuleAndConditionCapture()
427427

428428
var response = await server.CreateClient().GetAsync("article/23?p1=123&p2=abc");
429429

430-
Assert.Equal("/blog/article/23/abc", response.Headers.Location.OriginalString);
430+
Assert.Equal("/blog/article/23/abc?p1=123&p2=abc", response.Headers.Location.OriginalString);
431431
}
432432

433433
[Fact]

0 commit comments

Comments
 (0)