tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 22:24:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5995 from Icinga/fix/influxdb-requests

Browse Source 
Fix InfluxDB requests
This commit is contained in:
Gunnar Beutner 2018-01-17 10:28:15 +01:00 committed by GitHub
commit 71a032579b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/perfdata/influxdbwriter.cpp
View File

@ -321,6 +321,9 @@ String InfluxdbWriter::EscapeValue(const Value& value)
if (value.IsBoolean()) if (value.IsBoolean())
return value ? "true" : "false"; return value ? "true" : "false";
if (value.IsString())
return "\"" + EscapeKeyOrTagValue(value) + "\"";
return value; return value;
} }

5
lib/remote/httpresponse.cpp
View File

@ -207,6 +207,11 @@ bool HttpResponse::Parse(StreamReadContext& src, bool may_wait)
lengthIndicator = Convert::ToLong(contentLengthHeader); lengthIndicator = Convert::ToLong(contentLengthHeader);
} }
if (!hasLengthIndicator && ProtocolVersion != HttpVersion10 && !Headers->Contains("transfer-encoding")) {
Complete = true;
return true;
}
if (hasLengthIndicator && src.Eof) if (hasLengthIndicator && src.Eof)
BOOST_THROW_EXCEPTION(std::invalid_argument("Unexpected EOF in HTTP body")); BOOST_THROW_EXCEPTION(std::invalid_argument("Unexpected EOF in HTTP body"));