Thanks to visit codestin.com
Credit goes to github.com

Skip to content

If HTTP charset header is empty, do not append content encoding to Content-Type header #860

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

Closed
linquize wants to merge 2 commits into from
Closed

If HTTP charset header is empty, do not append content encoding to Content-Type header #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
477099e
If HTTP charset header is empty, do not append content encoding to Co…
linquize Jan 5, 2014
c20f33c
Add unit test for Content-Type header with and without charset set
linquize Jan 26, 2014
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
4 changes: 1 addition & 3 deletions mcs/class/System.Web/System.Web/HttpResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,9 +724,7 @@ void AddHeadersNoCache (NameValueCollection write_headers, bool final_flush)
string header = content_type;

if (charset_set || header == "text/plain" || header == "text/html") {
if (header.IndexOf ("charset=") == -1) {
if (charset == null || charset == "")
charset = ContentEncoding.HeaderName;
if (header.IndexOf ("charset=") == -1 && !string.IsNullOrEmpty (charset)) {
header += "; charset=" + charset;
}
}
Expand Down
46 changes: 46 additions & 0 deletions mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,52 @@ public void WriteHeaders ()
Assert.AreEqual ("always", unknown.Value, "#C10");
}

[Test] // pull #866
public void WriteHeadersNoCharset ()
{
FakeHttpWorkerRequest2 f;
HttpContext c = Cook (2, out f);

HttpResponse resp = c.Response;
resp.ContentType = "text/plain";

Assert.AreEqual ("text/plain", resp.ContentType, "#A1");

resp.Flush ();

KnownResponseHeader known;

Assert.LessOrEqual (1, f.KnownResponseHeaders.Count, "#B1");

known = (KnownResponseHeader)f.KnownResponseHeaders ["Content-Type"];
Assert.AreEqual (HttpWorkerRequest.HeaderContentType, known.Index, "#B2");
Assert.AreEqual ("text/plain", known.Value, "#B3");
}

[Test] // pull #866
public void WriteHeadersHasCharset ()
{
FakeHttpWorkerRequest2 f;
HttpContext c = Cook (2, out f);

HttpResponse resp = c.Response;
resp.ContentType = "text/plain";
resp.Charset = "big5";

Assert.AreEqual ("text/plain", resp.ContentType, "#A1");
Assert.AreEqual ("big5", resp.Charset, "#A2");

resp.Flush ();

KnownResponseHeader known;

Assert.LessOrEqual (1, f.KnownResponseHeaders.Count, "#B1");

known = (KnownResponseHeader)f.KnownResponseHeaders ["Content-Type"];
Assert.AreEqual (HttpWorkerRequest.HeaderContentType, known.Index, "#B2");
Assert.AreEqual ("text/plain; charset=big5", known.Value, "#B3");
}

[Test] // bug #485557
[Category ("NotWorking")] // bug #488702
public void ClearHeaders ()
Expand Down