# HG changeset patch
# User Benjamin Golinvaux <bgo@osimis.io>
# Date 1560623868 -7200
# Node ID df6c524024848af6d7b3686a2500c9e5f1445c63
# Parent  17423d072a95b5351a5ed807bab39419efdc576a# Parent  cdba0dbb468290c6994d0b3c525216e6c689c27e
merge

diff -r cdba0dbb4682 -r df6c52402484 Framework/Oracle/GetOrthancImageCommand.cpp
--- a/Framework/Oracle/GetOrthancImageCommand.cpp	Fri Jun 14 14:46:16 2019 +0200
+++ b/Framework/Oracle/GetOrthancImageCommand.cpp	Sat Jun 15 20:37:48 2019 +0200
@@ -45,7 +45,7 @@
 
   GetOrthancImageCommand::GetOrthancImageCommand() :
     uri_("/"),
-    timeout_(10),
+    timeout_(60),
     hasExpectedFormat_(false)
   {
   }
diff -r cdba0dbb4682 -r df6c52402484 Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp
--- a/Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp	Fri Jun 14 14:46:16 2019 +0200
+++ b/Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp	Sat Jun 15 20:37:48 2019 +0200
@@ -49,7 +49,7 @@
   GetOrthancWebViewerJpegCommand::GetOrthancWebViewerJpegCommand() :
     frame_(0),
     quality_(95),
-    timeout_(10),
+    timeout_(60),
     expectedFormat_(Orthanc::PixelFormat_Grayscale8)
   {
   }
diff -r cdba0dbb4682 -r df6c52402484 Framework/Oracle/OrthancRestApiCommand.cpp
--- a/Framework/Oracle/OrthancRestApiCommand.cpp	Fri Jun 14 14:46:16 2019 +0200
+++ b/Framework/Oracle/OrthancRestApiCommand.cpp	Sat Jun 15 20:37:48 2019 +0200
@@ -51,7 +51,7 @@
   OrthancRestApiCommand::OrthancRestApiCommand() :
     method_(Orthanc::HttpMethod_Get),
     uri_("/"),
-    timeout_(10)
+    timeout_(60)
   {
   }