Build/Merge fixes

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

diff --git a/lib/remote/pkiutility.cpp b/lib/remote/pkiutility.cpp
index b9da04ebebcc78d5e636f342a5c7cdf5552d9542..080626af5ca963e055404435e022779234be10a3 100644 (file)
--- a/lib/remote/pkiutility.cpp
+++ b/lib/remote/pkiutility.cpp
@@ -124,7 +124,7 @@ boost::shared_ptr<X509> PkiUtility::FetchCert(const String& host, const String&
        } catch (const std::exception& ex) {
                Log(LogCritical, "pki")
                        << "Client TLS handshake failed. (" << ex.what() << ")";
-               return std::shared_ptr<X509>();
+               return boost::shared_ptr<X509>();
        }
 
        return stream->GetPeerCertificate();