changeset 1872:09a737a6bf36

merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 07 Dec 2015 09:48:34 +0100
parents e8146c9c28a4 (diff) a6c431193c79 (current diff)
children 5e7feeb63d1f
files NEWS OrthancServer/main.cpp
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Sat Dec 05 12:45:19 2015 +0100
+++ b/NEWS	Mon Dec 07 09:48:34 2015 +0100
@@ -3,6 +3,7 @@
 
 * Fix modality worklists server if some fields are null
 * More tolerant "/series/.../ordered-slices" with broken series
+* Promiscuous mode is now turned off by default
 * Improved logging information if upgrade fails
 
 
--- a/OrthancServer/main.cpp	Sat Dec 05 12:45:19 2015 +0100
+++ b/OrthancServer/main.cpp	Mon Dec 07 09:48:34 2015 +0100
@@ -269,7 +269,7 @@
       }
     }
 
-    return Configuration::GetGlobalBoolParameter(configuration, true);
+    return Configuration::GetGlobalBoolParameter(configuration, false);
   }
 };
 
--- a/Resources/Configuration.json	Sat Dec 05 12:45:19 2015 +0100
+++ b/Resources/Configuration.json	Mon Dec 07 09:48:34 2015 +0100
@@ -104,7 +104,7 @@
 
   // Whether Orthanc accepts to act as C-Store SCP for unknown storage
   // SOP classes (aka. "promiscuous mode")
-  "UnknownSopClassAccepted"            : true,
+  "UnknownSopClassAccepted"            : false,