Mercurial > hg > orthanc

comparison OrthancServer/main.cpp @ 3867:7a7d18875985 c-get

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->c-get
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 27 Apr 2020 18:36:19 +0200
parents 3ab2d48c8f69 ff0718a4633a
children dba48c162b7b
comparison
equal deleted inserted replaced
3859:d30bce4bdae9 3867:7a7d18875985
36 36
37 #include <boost/algorithm/string/predicate.hpp> 37 #include <boost/algorithm/string/predicate.hpp>
38 38
39 #include "../Core/Compatibility.h" 39 #include "../Core/Compatibility.h"
40 #include "../Core/DicomFormat/DicomArray.h" 40 #include "../Core/DicomFormat/DicomArray.h"
41 #include "../Core/DicomNetworking/DicomAssociationParameters.h"
41 #include "../Core/DicomNetworking/DicomServer.h" 42 #include "../Core/DicomNetworking/DicomServer.h"
42 #include "../Core/DicomParsing/FromDcmtkBridge.h" 43 #include "../Core/DicomParsing/FromDcmtkBridge.h"
43 #include "../Core/HttpServer/EmbeddedResourceHttpHandler.h" 44 #include "../Core/HttpServer/EmbeddedResourceHttpHandler.h"
44 #include "../Core/HttpServer/FilesystemHttpHandler.h" 45 #include "../Core/HttpServer/FilesystemHttpHandler.h"
45 #include "../Core/HttpServer/HttpServer.h" 46 #include "../Core/HttpServer/HttpServer.h"
1302 HttpClient::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpTimeout", 0)); 1303 HttpClient::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpTimeout", 0));
1303 1304
1304 HttpClient::SetDefaultProxy(lock.GetConfiguration().GetStringParameter("HttpProxy", "")); 1305 HttpClient::SetDefaultProxy(lock.GetConfiguration().GetStringParameter("HttpProxy", ""));
1305 1306
1306 DicomUserConnection::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10)); 1307 DicomUserConnection::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10));
1308 DicomAssociationParameters::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10));
1307 1309
1308 maxCompletedJobs = lock.GetConfiguration().GetUnsignedIntegerParameter("JobsHistorySize", 10); 1310 maxCompletedJobs = lock.GetConfiguration().GetUnsignedIntegerParameter("JobsHistorySize", 10);
1309 1311
1310 if (maxCompletedJobs == 0) 1312 if (maxCompletedJobs == 0)
1311 { 1313 {