Skip to content

ignore case when looking for "charset" #4723

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

Merged
andralex merged 3 commits into from
Aug 10, 2016
Merged

ignore case when looking for "charset" #4723

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d65668
DRY: the HTTP struct already detects the charset
aG0aep6G Aug 8, 2016
84f7662
ignore case when looking for "charset"
aG0aep6G Aug 8, 2016
f87d112
fix selective import style
aG0aep6G Aug 9, 2016
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
68 changes: 47 additions & 21 deletions std/net/curl.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,6 @@ private auto _basicHTTP(T)(const(char)[] url, const(void)[] sendData, HTTP clien
HTTP.StatusLine statusLine;
import std.array : appender;
auto content = appender!(ubyte[])();
string[string] headers;
client.onReceive = (ubyte[] data)
{
content ~= data;
Expand Down Expand Up @@ -1025,32 +1024,14 @@ private auto _basicHTTP(T)(const(char)[] url, const(void)[] sendData, HTTP clien
import std.conv : to;
content.reserve(value.to!size_t);
}
if (auto v = key in headers)
{
*v ~= ", ";
*v ~= value;
}
else
headers[key] = value.idup;
};
client.onReceiveStatusLine = (HTTP.StatusLine l) { statusLine = l; };
client.perform();
enforce!CurlException(statusLine.code / 100 == 2,
format("HTTP request returned status code %d (%s)",
statusLine.code, statusLine.reason));

// Default charset defined in HTTP RFC
auto charset = "ISO-8859-1";
if (auto v = "content-type" in headers)
{
auto m = match(cast(char[]) (*v), regex("charset=([^;,]*)"));
if (!m.empty && m.captures.length > 1)
{
charset = m.captures[1].idup;
}
}

return _decodeContent!T(content.data, charset);
return _decodeContent!T(content.data, client.p.charset);
}

unittest
Expand Down Expand Up @@ -1088,6 +1069,31 @@ unittest
assert(res == "TRACERESPONSE");
}

unittest // charset detection and transcoding to T
{
testServer.handle((s) {
s.send("HTTP/1.1 200 OK\r\n"~
"Content-Length: 4\r\n"~
"Content-Type: text/plain; charset=utf-8\r\n" ~
"\r\n" ~
"äbc");
});
auto client = HTTP();
auto result = _basicHTTP!char(testServer.addr, "", client);
assert(result == "äbc");

testServer.handle((s) {
s.send("HTTP/1.1 200 OK\r\n"~
"Content-Length: 3\r\n"~
"Content-Type: text/plain; charset=iso-8859-1\r\n" ~
"\r\n" ~
0xE4 ~ "bc");
});
client = HTTP();
result = _basicHTTP!char(testServer.addr, "", client);
assert(result == "äbc");
}

/*
* Helper function for the high level interface.
*
Expand Down Expand Up @@ -2397,7 +2403,7 @@ struct HTTP
if (fieldName == "content-type")
{
auto mct = match(cast(char[]) m.captures[2],
regex("charset=([^;]*)"));
regex("charset=([^;]*)", "i"));
if (!mct.empty && mct.captures.length > 1)
charset = mct.captures[1].idup;
}
Expand Down Expand Up @@ -3138,6 +3144,26 @@ struct HTTP

} // HTTP

unittest // charset/Charset/CHARSET/...
{
import std.meta : AliasSeq;

foreach (c; AliasSeq!("charset", "Charset", "CHARSET", "CharSet", "charSet",
"ChArSeT", "cHaRsEt"))
{
testServer.handle((s) {
s.send("HTTP/1.1 200 OK\r\n"~
"Content-Length: 0\r\n"~
"Content-Type: text/plain; " ~ c ~ "=foo\r\n" ~
"\r\n");
});

auto http = HTTP(testServer.addr);
http.perform();
assert(http.p.charset == "foo");
}
}

/**
FTP client functionality.

Expand Down