oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

storage/curl: move code to IsXmlContentType()

Browse Source
This commit is contained in:
Max Kellermann 2017-09-01 11:30:30 +02:00
parent 3717fb6c8d
commit f6b56c9317
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/storage/plugins/CurlStorage.cxx
View File

@ -247,6 +247,21 @@ ParseU64(const char *s, size_t length)
return ParseU64(std::string(s, length).c_str()); return ParseU64(std::string(s, length).c_str());
} }
gcc_pure
static bool
IsXmlContentType(const char *content_type) noexcept
{
return strncmp(content_type, "text/xml", 8) == 0;
}
gcc_pure
static bool
IsXmlContentType(const std::multimap<std::string, std::string> &headers) noexcept
{
auto i = headers.find("content-type");
return i != headers.end() && IsXmlContentType(i->second.c_str());
}
/** /**
* A WebDAV PROPFIND request. Each "response" element will be passed * A WebDAV PROPFIND request. Each "response" element will be passed
* to OnDavResponse() (to be implemented by a derived class). * to OnDavResponse() (to be implemented by a derived class).
@ -308,9 +323,7 @@ private:
throw FormatRuntimeError("Status %d from WebDAV server; expected \"207 Multi-Status\"", throw FormatRuntimeError("Status %d from WebDAV server; expected \"207 Multi-Status\"",
status); status);
auto i = headers.find("content-type"); if (!IsXmlContentType(headers))
if (i == headers.end() ||
strncmp(i->second.c_str(), "text/xml", 8) != 0)
throw std::runtime_error("Unexpected Content-Type from WebDAV server"); throw std::runtime_error("Unexpected Content-Type from WebDAV server");
} }