tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build/Merge fixes

This commit is contained in:
Jean Flach 2018-02-23 10:27:55 +01:00
parent c5b92defec
commit adc054097d
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/remote/httpserverconnection.cpp
View File

@ -189,14 +189,13 @@ bool HttpServerConnection::ProcessMessage(void)
bool HttpServerConnection::ManageHeaders(HttpResponse& response) bool HttpServerConnection::ManageHeaders(HttpResponse& response)
{ {
static const size_t defaultContentLengthLimit = 1 * 1028 * 1028; static const size_t defaultContentLengthLimit = 1 * 1028 * 1028;
static const Dictionary::Ptr specialContentLengthLimits = new Dictionary({ static const Dictionary::Ptr specialContentLengthLimits = new Dictionary;
{"*", 512 * 1028 * 1028}, specialContentLengthLimits->Set("*", 512 * 1028 * 1028);
{"config/modify", 512 * 1028 * 1028}, specialContentLengthLimits->Set("config/modify", 512 * 1028 * 1028);
{"console", 512 * 1028 * 1028}, specialContentLengthLimits->Set("console", 512 * 1028 * 1028);
{"objects/create", 512 * 1028 * 1028}, specialContentLengthLimits->Set("objects/create", 512 * 1028 * 1028);
{"objects/modify", 512 * 1028 * 1028}, specialContentLengthLimits->Set("objects/modify", 512 * 1028 * 1028);
{"objects/delete", 512 * 1028 * 1028} specialContentLengthLimits->Set("objects/delete", 512 * 1028 * 1028);
});
if (m_CurrentRequest.Headers->Get("expect") == "100-continue") { if (m_CurrentRequest.Headers->Get("expect") == "100-continue") {
String continueResponse = "HTTP/1.1 100 Continue\r\n\r\n"; String continueResponse = "HTTP/1.1 100 Continue\r\n\r\n";

2
lib/remote/pkiutility.cpp
View File

@ -124,7 +124,7 @@ boost::shared_ptr<X509> PkiUtility::FetchCert(const String& host, const String&
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
Log(LogCritical, "pki") Log(LogCritical, "pki")
<< "Client TLS handshake failed. (" << ex.what() << ")"; << "Client TLS handshake failed. (" << ex.what() << ")";
return std::shared_ptr<X509>(); return boost::shared_ptr<X509>();
} }
return stream->GetPeerCertificate(); return stream->GetPeerCertificate();