Skip to content

Fix PlaceholderRewriter: Detect response as html response as well, if charset is set in response header content-type #468

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix PlaceholderRewriter: Detect response as html response as well, if charset is set in response header content-type #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions src/Cassette.Aspnet.UnitTests/PlaceholderRewriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,18 @@ public void GivenCanRewriteOutput_WhenRewriteOutput_ThenPlaceholderReplacingResp
response.VerifySet(r => r.Filter = It.IsAny<PlaceholderReplacingResponseFilter>());
}

[Fact]
public void GivenWithCharsetCanRewriteOutput_WhenRewriteOutput_ThenPlaceholderReplacingResponseFilterSetForResponse()
{
settings.IsHtmlRewritingEnabled = true;
ContentType("text/html; charset=utf-8");
StatusCode(200);

rewriter.RewriteOutput();

response.VerifySet(r => r.Filter = It.IsAny<PlaceholderReplacingResponseFilter>());
}

[Fact]
public void GivenXhtmlContentType_WhenRewriteOutput_ThenPlaceholderReplacingResponseFilterSetForResponse()
{
Expand All @@ -61,6 +73,18 @@ public void GivenXhtmlContentType_WhenRewriteOutput_ThenPlaceholderReplacingResp
response.VerifySet(r => r.Filter = It.IsAny<PlaceholderReplacingResponseFilter>());
}

[Fact]
public void GivenXhtmlContentTypeWithCharset_WhenRewriteOutput_ThenPlaceholderReplacingResponseFilterSetForResponse()
{
settings.IsHtmlRewritingEnabled = true;
ContentType("application/xhtml+xml; charset=utf-8");
StatusCode(200);

rewriter.RewriteOutput();

response.VerifySet(r => r.Filter = It.IsAny<PlaceholderReplacingResponseFilter>());
}

[Fact]
public void GivenStatusCodeIsRedirect_WhenRewriteOutput_ThenFilterNotInstalled()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Cassette.Aspnet/PlaceholderRewriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ bool CanRewriteOutput(HttpContextBase httpContext)

bool IsHtmlResponse(HttpContextBase httpContext)
{
return httpContext.Response.ContentType == "text/html" ||
httpContext.Response.ContentType == "application/xhtml+xml";
return httpContext.Response.ContentType.StartsWith("text/html") ||
httpContext.Response.ContentType.StartsWith("application/xhtml+xml");
}
}
}