Mercurial > hg > orthanc

comparison OrthancServer/main.cpp @ 3865:ff0718a4633a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix missing DicomAssociationParameters::SetDefaultTimeout()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 27 Apr 2020 18:33:33 +0200
parents ee0a1211419f
children e1c2bc9a5cc1 7a7d18875985
comparison
equal deleted inserted replaced
3860:9ccbbd55bc23 3865:ff0718a4633a
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"
1287 HttpClient::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpTimeout", 0)); 1288 HttpClient::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpTimeout", 0));
1288 1289
1289 HttpClient::SetDefaultProxy(lock.GetConfiguration().GetStringParameter("HttpProxy", "")); 1290 HttpClient::SetDefaultProxy(lock.GetConfiguration().GetStringParameter("HttpProxy", ""));
1290 1291
1291 DicomUserConnection::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10)); 1292 DicomUserConnection::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10));
1293 DicomAssociationParameters::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10));
1292 1294
1293 maxCompletedJobs = lock.GetConfiguration().GetUnsignedIntegerParameter("JobsHistorySize", 10); 1295 maxCompletedJobs = lock.GetConfiguration().GetUnsignedIntegerParameter("JobsHistorySize", 10);
1294 1296
1295 if (maxCompletedJobs == 0) 1297 if (maxCompletedJobs == 0)
1296 { 1298 {