Mercurial > hg > orthanc
diff OrthancServer/main.cpp @ 3867:7a7d18875985 c-get
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 |
line wrap: on
line diff
--- a/OrthancServer/main.cpp Tue Apr 21 16:39:52 2020 +0200 +++ b/OrthancServer/main.cpp Mon Apr 27 18:36:19 2020 +0200 @@ -38,6 +38,7 @@ #include "../Core/Compatibility.h" #include "../Core/DicomFormat/DicomArray.h" +#include "../Core/DicomNetworking/DicomAssociationParameters.h" #include "../Core/DicomNetworking/DicomServer.h" #include "../Core/DicomParsing/FromDcmtkBridge.h" #include "../Core/HttpServer/EmbeddedResourceHttpHandler.h" @@ -1304,6 +1305,7 @@ HttpClient::SetDefaultProxy(lock.GetConfiguration().GetStringParameter("HttpProxy", "")); DicomUserConnection::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10)); + DicomAssociationParameters::SetDefaultTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("DicomScuTimeout", 10)); maxCompletedJobs = lock.GetConfiguration().GetUnsignedIntegerParameter("JobsHistorySize", 10);