diff options
| author | Krombel <krombel@krombel.de> | 2018-03-20 23:33:42 +0100 |
|---|---|---|
| committer | Krombel <krombel@krombel.de> | 2018-03-20 23:42:49 +0100 |
| commit | 4e78035d03817c29ceac46bdf9cb045e4ba3a101 (patch) | |
| tree | c1e0ffabd6498dfd591f5a901b6a4db8e4f5d7b5 | |
| parent | 551935c24f66b7db4c6845c8a92cecc980fe3834 (diff) | |
| download | libquotient-4e78035d03817c29ceac46bdf9cb045e4ba3a101.tar.gz libquotient-4e78035d03817c29ceac46bdf9cb045e4ba3a101.zip | |
ignore possible appendixes from content type
Currently libqmatrixclient fails checking the `Content-Type` header
when there is an appendix like "charset". That is allowed e.g. in
[rfc7231](https://tools.ietf.org/html/rfc7231#section-3.1.1.5))
One example is a Content-Type `application/json` vs `application/json;charset=UTF-8`
Setting of the charset appendis is currently not supported. It fails with
libqmatrixclient.jobs: "LoginJob" status 106 : "Incorrect content type of the response"
This PR aims to just drop that appendix as it is currently not handled somewhere else.
| -rw-r--r-- | jobs/basejob.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp index 7669d1d4..981b75b1 100644 --- a/jobs/basejob.cpp +++ b/jobs/basejob.cpp @@ -282,9 +282,12 @@ bool checkContentType(const QByteArray& type, const QByteArrayList& patterns) if (patterns.isEmpty()) return true; + // ignore possible appendixes of the content type + const auto ctype = type.split(';').front(); + for (const auto& pattern: patterns) { - if (pattern.startsWith('*') || type == pattern) // Fast lane + if (pattern.startsWith('*') || ctype == pattern) // Fast lane return true; auto patternParts = pattern.split('/'); @@ -292,7 +295,7 @@ bool checkContentType(const QByteArray& type, const QByteArrayList& patterns) "BaseJob: Expected content type should have up to two" " /-separated parts; violating pattern: " + pattern); - if (type.split('/').front() == patternParts.front() && + if (ctype.split('/').front() == patternParts.front() && patternParts.back() == "*") return true; // Exact match already went on fast lane } |